diff --git a/.drone.yml b/.drone.yml
index e935835beda..59d14f14ac0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -724,8 +724,8 @@ steps:
   name: test-a11y-frontend
 - commands:
   - docker run --privileged --rm tonistiigi/binfmt --install all
-  - /src/grafana-build docker --package=$(cat packages.txt | grep tar.gz | grep -v
-    docker | grep -v sha256) --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.17.1
+  - /src/grafana-build docker $(cat packages.txt | grep tar.gz | grep -v docker |
+    grep -v sha256 | awk '{print "--package=" $0}') --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.17.1
     --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{
     .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
   - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
@@ -1897,8 +1897,8 @@ steps:
     - grafana/grafana
 - commands:
   - docker run --privileged --rm tonistiigi/binfmt --install all
-  - /src/grafana-build docker --package=$(cat packages.txt | grep tar.gz | grep -v
-    docker | grep -v sha256) --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.17.1
+  - /src/grafana-build docker $(cat packages.txt | grep tar.gz | grep -v docker |
+    grep -v sha256 | awk '{print "--package=" $0}') --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.17.1
     --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{
     .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
   - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
@@ -4173,6 +4173,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 949da38eb5870264a09e11ba9f82401c5ddf14666325502f915a8e9b5e2b857c
+hmac: 3f0b291de7bb76eea4fe7ca2416f95bf54c18a0e4b87f707b883524f223efa21
 
 ...
diff --git a/scripts/drone/steps/rgm.star b/scripts/drone/steps/rgm.star
index b41e5fde8ea..2e5d17e19a4 100644
--- a/scripts/drone/steps/rgm.star
+++ b/scripts/drone/steps/rgm.star
@@ -41,7 +41,7 @@ def rgm_build_docker_step(packages, ubuntu, alpine, depends_on = ["rgm-package"]
         "commands": [
             "docker run --privileged --rm tonistiigi/binfmt --install all",
             "/src/grafana-build docker " +
-            "--package=$(cat {} | grep tar.gz | grep -v docker | grep -v sha256) ".format(packages) +
+            "$(cat {} | grep tar.gz | grep -v docker | grep -v sha256 | awk '{{print \"--package=\" $0}}') ".format(packages) +
             "--ubuntu-base={} ".format(ubuntu) +
             "--alpine-base={} ".format(alpine) +
             "--tag-format='{}' ".format(tag_format) +