diff --git a/scripts/drone/pipelines/main.star b/scripts/drone/pipelines/main.star
index 2cd25d3866a..eb259e266de 100644
--- a/scripts/drone/pipelines/main.star
+++ b/scripts/drone/pipelines/main.star
@@ -109,7 +109,7 @@ def get_steps(edition, is_downstream=False):
     steps.extend([
         release_canary_npm_packages_step(edition),
         upload_packages_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
-        upload_cdn_step(edition=edition)
+        upload_cdn_step(edition=edition, ver_mode=ver_mode)
     ])
 
     if include_enterprise2:
@@ -117,7 +117,7 @@ def get_steps(edition, is_downstream=False):
         steps.extend([
             package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64'], is_downstream=is_downstream),
             upload_packages_step(edition=edition2, ver_mode=ver_mode, is_downstream=is_downstream),
-            upload_cdn_step(edition=edition2)
+            upload_cdn_step(edition=edition2, ver_mode=ver_mode)
         ])
 
     windows_steps = get_windows_steps(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream)
diff --git a/scripts/drone/pipelines/release.star b/scripts/drone/pipelines/release.star
index 20445307e2d..56ba6af31a3 100644
--- a/scripts/drone/pipelines/release.star
+++ b/scripts/drone/pipelines/release.star
@@ -175,7 +175,7 @@ def get_steps(edition, ver_mode):
       build_steps.extend([redis_integration_tests_step(edition=edition2, ver_mode=ver_mode), memcached_integration_tests_step(edition=edition2, ver_mode=ver_mode)])
 
     if should_upload:
-        publish_steps.append(upload_cdn_step(edition=edition))
+        publish_steps.append(upload_cdn_step(edition=edition, ver_mode=ver_mode))
         publish_steps.append(upload_packages_step(edition=edition, ver_mode=ver_mode))
     if should_publish:
         publish_step = publish_storybook_step(edition=edition, ver_mode=ver_mode)
@@ -191,7 +191,7 @@ def get_steps(edition, ver_mode):
     if include_enterprise2:
         publish_steps.extend([
             package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64']),
-            upload_cdn_step(edition=edition2),
+            upload_cdn_step(edition=edition2, ver_mode=ver_mode),
         ])
         if should_upload:
             step = upload_packages_step(edition=edition2, ver_mode=ver_mode)
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index c93e2218325..0d71a8a9a3f 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -292,7 +292,12 @@ def publish_storybook_step(edition, ver_mode):
     }
 
 
-def upload_cdn_step(edition):
+def upload_cdn_step(edition, ver_mode):
+    if ver_mode == "release":
+        bucket = "$${PRERELEASE_BUCKET}/artifacts/static-assets"
+    else:
+        bucket = "grafana-static-assets"
+
     deps = []
     if edition in 'enterprise2':
         deps.extend([