diff --git a/.buildkite/packaging.pipeline.yml b/.buildkite/packaging.pipeline.yml
index 198db267425..a7fdabb2268 100644
--- a/.buildkite/packaging.pipeline.yml
+++ b/.buildkite/packaging.pipeline.yml
@@ -28,6 +28,7 @@ steps:
           - make beats-dashboards
         env:
           SNAPSHOT: true
+          DEV: true
         artifact_paths:
           - build/distributions/**/*
 
@@ -42,6 +43,9 @@ steps:
         commands:
           - make build/distributions/dependencies.csv
           - make beats-dashboards
+        env:
+          SNAPSHOT: false
+          DEV: false
         artifact_paths:
           - build/distributions/**/*
 
@@ -53,6 +57,7 @@ steps:
         env:
           PLATFORMS: "${PLATFORMS}"
           SNAPSHOT: true
+          DEV: true
         command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}"
         agents:
           provider: gcp
@@ -82,6 +87,7 @@ steps:
           PLATFORMS: "${PLATFORMS_ARM}"
           PACKAGES: "docker"
           SNAPSHOT: true
+          DEV: true
         command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}"
         agents:
           provider: "aws"
@@ -107,6 +113,7 @@ steps:
         env:
           PLATFORMS: "${PLATFORMS}"
           SNAPSHOT: true
+          DEV: true
         command: ".buildkite/scripts/packaging/package-dra.sh x-pack/agentbeat"
         agents:
           provider: gcp
@@ -125,6 +132,7 @@ steps:
         env:
           PLATFORMS: "${PLATFORMS}"
           SNAPSHOT: false
+          DEV: false
         command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}"
         agents:
           provider: gcp
@@ -154,6 +162,7 @@ steps:
           PLATFORMS: "${PLATFORMS_ARM}"
           PACKAGES: "docker"
           SNAPSHOT: false
+          DEV: false
         command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}"
         agents:
           provider: "aws"
@@ -179,6 +188,7 @@ steps:
         env:
           PLATFORMS: "${PLATFORMS}"
           SNAPSHOT: false
+          DEV: false
         command: ".buildkite/scripts/packaging/package-dra.sh x-pack/agentbeat"
         agents:
           provider: gcp
@@ -201,7 +211,7 @@ steps:
           - dashboards-snapshot
         command: |
           buildkite-agent artifact download "build/**/*" . 
-          .buildkite/scripts/packaging/prepare-release-manager.sh
+          .buildkite/scripts/packaging/prepare-release-manager.sh snapshot
           .buildkite/scripts/dra.sh
         agents:
           provider: gcp
@@ -219,7 +229,7 @@ steps:
           - dashboards-staging
         command: |
           buildkite-agent artifact download "build/**" .
-          .buildkite/scripts/packaging/prepare-release-manager.sh
+          .buildkite/scripts/packaging/prepare-release-manager.sh staging
           .buildkite/scripts/dra.sh
         agents:
           provider: gcp