diff --git a/.drone.yml b/.drone.yml
index 4f3ce8839bf..a315b8b549e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -986,6 +986,21 @@ steps:
     NODE_OPTIONS: --max_old_space_size=8192
   image: node:20.9.0-alpine
   name: build-frontend-packages
+- commands:
+  - /src/grafana-build artifacts -a targz:grafana:enterprise:linux/amd64 -a targz:grafana:enterprise:linux/arm64
+    -a targz:grafana:enterprise:linux/arm/v7 --go-version=1.23.1 --yarn-cache=$$YARN_CACHE_FOLDER
+    --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt
+  depends_on:
+  - yarn-install
+  environment:
+    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
+      from_secret: dagger_token
+  image: grafana/grafana-build:main
+  name: rgm-package
+  pull: always
+  volumes:
+  - name: docker
+    path: /var/run/docker.sock
 - commands:
   - yarn e2e:plugin:build
   depends_on:
@@ -1001,7 +1016,7 @@ steps:
   - cp -r devenv scripts tools grafana && cd grafana && ./scripts/grafana-server/start-server
     e2e/extensions/enterprise/license.jwt
   depends_on:
-  - yarn-install
+  - rgm-package
   detach: true
   environment:
     GF_APP_MODE: development
@@ -6122,6 +6137,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 9f767aa1c6b75a3debee1207415453aa75b8db956da1844d9680467cbb459fea
+hmac: 045b97dd1d57a83cbecda9dbd366b638cc47debc340f30f68db5fcf9cd6f431b
 
 ...
diff --git a/scripts/drone/pipelines/build.star b/scripts/drone/pipelines/build.star
index 637d1b1cf20..e2f43024da8 100644
--- a/scripts/drone/pipelines/build.star
+++ b/scripts/drone/pipelines/build.star
@@ -205,8 +205,9 @@ def build_e2e_enterprise(trigger):
 
     build_steps = [
         build_frontend_package_step(),
+        rgm_artifacts_step(artifacts = ["targz:grafana:enterprise:linux/amd64", "targz:grafana:enterprise:linux/arm64", "targz:grafana:enterprise:linux/arm/v7"], file = "packages.txt"),
         build_test_plugins_step(),
-        grafana_server_step("e2e/extensions/enterprise/license.jwt",True,"yarn-install"),
+        grafana_server_step("e2e/extensions/enterprise/license.jwt",True),
         grafana_image_renderer_step(),
         e2e_tests_step("enterprise-smtp"),
     ]
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index a12f0bfee58..c1860f0b3a2 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -755,12 +755,8 @@ def codespell_step():
         ],
     }
 
-def grafana_server_step(license_path="", image_rendering_setup=False, depends_on="rgm-package"):
+def grafana_server_step(license_path="", image_rendering_setup=False):
     """Runs the grafana-server binary as a service.
-    Args:
-        license_path: path to a license file to run Grafana Enterprise
-        image_rendering_setup: set to True to configure a remote image renderer
-        depends_on: dependency step
 
     Returns:
       Drone step.
@@ -785,7 +781,9 @@ def grafana_server_step(license_path="", image_rendering_setup=False, depends_on
         "name": "grafana-server",
         "image": images["alpine"],
         "detach": True,
-        "depends_on": [depends_on],
+        "depends_on": [
+            "rgm-package",
+        ],
         "environment": environment,
         "commands": [
             "apk add --update tar bash",