diff --git a/.drone.yml b/.drone.yml
index 1871e4e62ee..fb6ba2cbdef 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3001,7 +3001,7 @@ steps:
     DESTINATION:
       from_secret: destination
     GCP_KEY_BASE64:
-      from_secret: rgm_global_gcp_key_base64
+      from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
     GPG_PASSPHRASE:
@@ -3058,7 +3058,7 @@ steps:
     DESTINATION:
       from_secret: destination
     GCP_KEY_BASE64:
-      from_secret: rgm_global_gcp_key_base64
+      from_secret: gcp_key_base64
     GITHUB_TOKEN:
       from_secret: github_token
     GPG_PASSPHRASE:
@@ -4516,19 +4516,13 @@ kind: secret
 name: enterprise2-cdn-path
 ---
 get:
-  name: gcp_service_account_base64
+  name: gcp_service_account_prod_base64
   path: infra/data/ci/grafana-release-eng/rgm
 kind: secret
 name: gcp_key_base64
 ---
 get:
-  name: gcp_global_service_account_base64
-  path: infra/data/ci/grafana-release-eng/rgm
-kind: secret
-name: rgm_global_gcp_key_base64
----
-get:
-  name: destination
+  name: destination_prod
   path: infra/data/ci/grafana-release-eng/rgm
 kind: secret
 name: destination
@@ -4564,6 +4558,6 @@ kind: secret
 name: delivery-bot-app-private-key
 ---
 kind: signature
-hmac: 4a4afb0cd555ae8a80a91ab7b828bd3969df0cb20ada138532b00518f576d000
+hmac: b5b1af713bae6d6556303a55047e4448f8bcdb176a7936019e3e146b208aeded
 
 ...
diff --git a/scripts/drone/rgm.star b/scripts/drone/rgm.star
index 48fa470c85d..50eb2fd219d 100644
--- a/scripts/drone/rgm.star
+++ b/scripts/drone/rgm.star
@@ -34,12 +34,12 @@ load(
     "from_secret",
     "rgm_dagger_token",
     "rgm_destination",
+    "rgm_gcp_key_base64",
     "rgm_github_token",
-    "rgm_global_gcp_key_base64",
 )
 
 rgm_env_secrets = {
-    "GCP_KEY_BASE64": from_secret(rgm_global_gcp_key_base64),
+    "GCP_KEY_BASE64": from_secret(rgm_gcp_key_base64),
     "DESTINATION": from_secret(rgm_destination),
     "GITHUB_TOKEN": from_secret(rgm_github_token),
     "_EXPERIMENTAL_DAGGER_CLOUD_TOKEN": from_secret(rgm_dagger_token),
diff --git a/scripts/drone/vault.star b/scripts/drone/vault.star
index f6c62965a5e..ad98a74996f 100644
--- a/scripts/drone/vault.star
+++ b/scripts/drone/vault.star
@@ -12,7 +12,6 @@ azure_sp_app_id = "azure_sp_app_id"
 azure_sp_app_pw = "azure_sp_app_pw"
 azure_tenant = "azure_tenant"
 
-rgm_global_gcp_key_base64 = "rgm_global_gcp_key_base64"
 rgm_gcp_key_base64 = "gcp_key_base64"
 rgm_destination = "destination"
 rgm_github_token = "github_token"
@@ -109,17 +108,12 @@ def secrets():
         vault_secret(
             rgm_gcp_key_base64,
             "infra/data/ci/grafana-release-eng/rgm",
-            "gcp_service_account_base64",
-        ),
-        vault_secret(
-            rgm_global_gcp_key_base64,
-            "infra/data/ci/grafana-release-eng/rgm",
-            "gcp_global_service_account_base64",
+            "gcp_service_account_prod_base64",
         ),
         vault_secret(
             rgm_destination,
             "infra/data/ci/grafana-release-eng/rgm",
-            "destination",
+            "destination_prod",
         ),
         vault_secret(
             rgm_dagger_token,