diff --git a/.drone.yml b/.drone.yml
index df536b9f81c..6883dcac6b6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4687,9 +4687,9 @@ steps:
     path: /github-app
 - commands:
   - export GITHUB_TOKEN=$(cat /github-app/token)
-  - 'dagger run --silent /src/grafana-build artifacts -a $${ARTIFACTS} --grafana-ref=$${GRAFANA_REF}
-    --enterprise-ref=$${ENTERPRISE_REF} --grafana-repo=$${GRAFANA_REPO} --version=$${VERSION} '
-  - --go-version=1.23.5
+  - dagger run --silent /src/grafana-build artifacts -a $${ARTIFACTS} --grafana-ref=$${GRAFANA_REF}
+    --enterprise-ref=$${ENTERPRISE_REF} --grafana-repo=$${GRAFANA_REPO} --version=$${VERSION}
+    --go-version=1.23.5
   depends_on:
   - github-app-generate-token
   environment:
@@ -4734,6 +4734,8 @@ steps:
   - printenv GCP_KEY_BASE64 | base64 -d > /tmp/key.json
   - gcloud auth activate-service-account --key-file=/tmp/key.json
   - gcloud storage cp -r dist/* $${UPLOAD_TO}
+  depends_on:
+  - rgm-build
   environment:
     _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
       from_secret: dagger_token
@@ -4774,6 +4776,8 @@ volumes:
   name: docker
 - name: github-app
   path: /github-app
+- name: github-app
+  temp: {}
 ---
 clone:
   retries: 3
@@ -5560,6 +5564,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 6e01278547a6f0803b7723e5f1e73bd94c572fa4805517232d3897717cee30f6
+hmac: 558d477c002eb799c23f6631aafc7df933518e445e59f34ceb989e73f4dc60bc
 
 ...
diff --git a/scripts/drone/rgm.star b/scripts/drone/rgm.star
index f81effc892a..37b4fad4f70 100644
--- a/scripts/drone/rgm.star
+++ b/scripts/drone/rgm.star
@@ -19,6 +19,7 @@ load(
 load(
     "scripts/drone/steps/github.star",
     "github_app_generate_token_step",
+    "github_app_pipeline_volumes",
     "github_app_step_volumes",
 )
 load(
@@ -350,7 +351,7 @@ def rgm_promotion_pipeline():
             "--grafana-ref=$${GRAFANA_REF} " +
             "--enterprise-ref=$${ENTERPRISE_REF} " +
             "--grafana-repo=$${GRAFANA_REPO} " +
-            "--version=$${VERSION} ",
+            "--version=$${VERSION} " +
             "--go-version={}".format(golang_version),
         ],
         "environment": rgm_env_secrets(env),
@@ -364,6 +365,11 @@ def rgm_promotion_pipeline():
     build_step["depends_on"] = [
         generate_token_step["name"],
     ]
+
+    publish_step["depends_on"] = [
+        build_step["name"],
+    ]
+
     steps = [
         generate_token_step,
         build_step,
@@ -375,7 +381,7 @@ def rgm_promotion_pipeline():
             name = "rgm-promotion",
             trigger = promotion_trigger,
             steps = steps,
-            volumes = github_app_step_volumes(),
+            volumes = github_app_step_volumes() + github_app_pipeline_volumes(),
         ),
     ]