diff --git a/.drone.yml b/.drone.yml
index 3892860d9e5..3a254033aee 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -372,7 +372,7 @@ steps:
   - cd -
   - git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*"
     && git fetch
-  - git rebase origin/main
+  - git stash && git rebase origin/main
   - if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git
     push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG};
     fi
@@ -1238,7 +1238,7 @@ steps:
   - cd -
   - git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*"
     && git fetch
-  - git rebase origin/main
+  - git stash && git rebase origin/main
   - if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git
     push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG};
     fi
@@ -5338,6 +5338,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: 83d0f265160c3006dbf7c7c5098a893b0b821b43deb5c8db5ce9f5217a868321
+hmac: 1b6874e508d7d7e5ae795e15eeeae142f99a54057edd706345cc59e65c94f048
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 61e1e46d821..2be36861138 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1210,7 +1210,7 @@ def trigger_test_release():
             'git tag $${TEST_TAG} && git push origin $${TEST_TAG}',
             'cd -',
             'git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*" && git fetch',
-            'git rebase origin/main',
+            'git stash && git rebase origin/main',
             'if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG}; fi',
             'git tag $${TEST_TAG} && git push https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG}',
         ],