diff --git a/.github/workflows/publish_canary_docker.yml b/.github/workflows/publish_canary_docker.yml
index 66dfb61c..fc4cb412 100644
--- a/.github/workflows/publish_canary_docker.yml
+++ b/.github/workflows/publish_canary_docker.yml
@@ -7,7 +7,6 @@ on:
 jobs:
   publish-canary-docker:
     name: "publish to DockerHub"
-    # We use `docker push --all-tags` to push all tags which is a newly addition to docker
     runs-on: ubuntu-20.04
     if: github.repository == 'microsoft/playwright-java'
     steps:
diff --git a/.github/workflows/publish_docker_release.yml b/.github/workflows/publish_docker_release.yml
index 5497199d..6a86ffff 100644
--- a/.github/workflows/publish_docker_release.yml
+++ b/.github/workflows/publish_docker_release.yml
@@ -8,7 +8,6 @@ on:
 jobs:
   publish-canary-docker:
     name: publish to DockerHub
-    # We use `docker push --all-tags` to push all tags which is a newly addition to docker
     runs-on: ubuntu-20.04
     if: github.repository == 'microsoft/playwright-java'
     steps:
@@ -34,4 +33,4 @@ jobs:
         ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:latest
         ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:focal
         ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:${TAG_NAME}
-        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:focal-${TAG_NAME}
+        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:${TAG_NAME}-focal