diff --git a/.github/workflows/publish_canary_docker.yml b/.github/workflows/publish_canary_docker.yml
index eb79d81953..a2fdaae65a 100644
--- a/.github/workflows/publish_canary_docker.yml
+++ b/.github/workflows/publish_canary_docker.yml
@@ -32,7 +32,6 @@ jobs:
     - run: ./docs/docker/build.sh
     - name: tag & publish
       run: |
-        docker tag playwright:localbuild playwright.azurecr.io/public/playwright:next
-        docker tag playwright:localbuild playwright.azurecr.io/public/playwright:sha-${{ github.sha }}
-        docker push --all-tags playwright.azurecr.io/public/playwright
+        ./docs/docker/tag_and_push.sh playwright.azurecr.io/public/playwright:next
+        ./docs/docker/tag_and_push.sh playwright.azurecr.io/public/playwright:sha-${{ github.sha }}
 
diff --git a/docs/docker/tag_and_push.sh b/docs/docker/tag_and_push.sh
new file mode 100755
index 0000000000..b754084317
--- /dev/null
+++ b/docs/docker/tag_and_push.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "-- tagging: $1"
+docker tag playwright:localbuild $1
+docker push $1