diff --git a/.buildkite/scripts/dra_release.sh b/.buildkite/scripts/dra_release.sh
index 769470467..1c1506698 100755
--- a/.buildkite/scripts/dra_release.sh
+++ b/.buildkite/scripts/dra_release.sh
@@ -32,9 +32,11 @@ with_go
 
 with_mage
 
+export RM_VERSION="${VERSION}"
 
 if [[ ${TYPE} == "snapshot" ]]; then
     export SNAPSHOT=true
+    VERSION="${VERSION}-SNAPSHOT"
 fi
 
 mkdir -p ${BASE_DIR}/reports
diff --git a/.buildkite/scripts/release-manager.sh b/.buildkite/scripts/release-manager.sh
index dc7cd85ec..bc6a35987 100755
--- a/.buildkite/scripts/release-manager.sh
+++ b/.buildkite/scripts/release-manager.sh
@@ -54,7 +54,7 @@ run_release_manager() {
         --commit "$(git rev-parse HEAD)" \
         --workflow "${TYPE}" \
         --artifact-set main \
-        --version "${VERSION}" \
+        --version "${RM_VERSION}" \
         $dry_run 2>&1 | tee "$OUTPUT_FILE" \
         #
 }