diff --git a/.drone.yml b/.drone.yml
index 56b4e24eb4c..abe9159a90f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3010,7 +3010,7 @@ steps:
     GPG_PUBLIC_KEY:
       from_secret: packages_gpg_public_key
   failure: ignore
-  image: grafana/grafana-build:dev-fda506a
+  image: grafana/grafana-build:dev-2f36afa
   name: rgm-build
   volumes:
   - name: docker
@@ -3066,7 +3066,7 @@ steps:
     GPG_PUBLIC_KEY:
       from_secret: packages_gpg_public_key
   failure: ignore
-  image: grafana/grafana-build:dev-fda506a
+  image: grafana/grafana-build:dev-2f36afa
   name: rgm-build
   volumes:
   - name: docker
@@ -4556,6 +4556,6 @@ kind: secret
 name: delivery-bot-app-private-key
 ---
 kind: signature
-hmac: 0cc06af0fe79d4fc98d6535bf542659e7e7dfa21ade0ed119d2f185bfd323cb7
+hmac: 07093bf94b6ef9cd731755d3a15ec230817ecd07a72a67e8142e775fd7100f00
 
 ...
diff --git a/scripts/drone/rgm.star b/scripts/drone/rgm.star
index acf94972b63..b09e96f9702 100644
--- a/scripts/drone/rgm.star
+++ b/scripts/drone/rgm.star
@@ -76,7 +76,7 @@ tag_trigger = {
 def rgm_build(script = "drone_publish_main.sh"):
     rgm_build_step = {
         "name": "rgm-build",
-        "image": "grafana/grafana-build:dev-fda506a",
+        "image": "grafana/grafana-build:dev-2f36afa",
         "commands": [
             "export GRAFANA_DIR=$$(pwd)",
             "cd /src && ./scripts/{}".format(script),