diff --git a/.drone.yml b/.drone.yml
index 949656fb77f..597e2dbcc81 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2108,9 +2108,8 @@ steps:
   image: grafana/build-container:1.6.4
   name: build-storybook
   when:
-    paths:
-      include:
-      - packages/grafana-ui/**
+    event:
+    - tag
 - commands:
   - ./bin/grabpl upload-cdn --edition oss
   depends_on:
@@ -2153,9 +2152,8 @@ steps:
   image: grafana/grafana-ci-deploy:1.3.3
   name: store-storybook
   when:
-    paths:
-      include:
-      - packages/grafana-ui/**
+    event:
+    - tag
 - commands:
   - ./bin/grabpl artifacts npm store --tag ${DRONE_TAG}
   depends_on:
@@ -5627,6 +5625,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: cfb6cc1cafb8123bc6a676b37fcd989de64bef962027cc8d39af3789a581a3a0
+hmac: b982fb6ded3969d879e9f4b3be5043094e5dd48211f7b30cb5e9ef212aa89928
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index d5c256fa3d9..f218ababfba 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -16,13 +16,6 @@ trigger_oss = {
         'grafana/grafana',
     ]
 }
-trigger_storybook = {
-    'paths': {
-        'include': [
-            'packages/grafana-ui/**',
-        ],
-    }
-}
 
 
 def slack_step(channel, template, secret):
@@ -259,7 +252,7 @@ def build_storybook_step(edition, ver_mode):
             'yarn storybook:build',
             './bin/grabpl verify-storybook',
         ],
-        'when': trigger_storybook,
+        'when': get_trigger_storybook(ver_mode),
     }
 
 
@@ -287,7 +280,7 @@ def store_storybook_step(edition, ver_mode, trigger=None):
             'PRERELEASE_BUCKET': from_secret(prerelease_bucket)
         },
         'commands': commands,
-        'when': trigger_storybook,
+        'when': get_trigger_storybook(ver_mode),
     }
     if trigger and ver_mode in ("release-branch", "main"):
         # no dict merge operation available, https://github.com/harness/drone-cli/pull/220
@@ -1276,3 +1269,19 @@ def compile_build_cmd(edition='oss'):
             'CGO_ENABLED': 0,
     },
 }
+
+def get_trigger_storybook(ver_mode):
+    trigger_storybook = ''
+    if ver_mode == 'release':
+        trigger_storybook = {
+            'event': ['tag']
+        }
+    else:
+        trigger_storybook = {
+            'paths': {
+                'include': [
+                    'packages/grafana-ui/**',
+                ],
+            }
+        }
+    return trigger_storybook