diff --git a/utils/docker/publish_docker.sh b/utils/docker/publish_docker.sh
index 246a8abf6..2b991e11d 100755
--- a/utils/docker/publish_docker.sh
+++ b/utils/docker/publish_docker.sh
@@ -35,25 +35,26 @@ if [[ -z "${GITHUB_SHA}" ]]; then
 fi
 
 FOCAL_TAGS=(
-  "next"
-  "sha-${GITHUB_SHA}"
   "next-focal"
 )
 
 if [[ "$RELEASE_CHANNEL" == "stable" ]]; then
-  FOCAL_TAGS+=("latest")
   FOCAL_TAGS+=("focal")
   FOCAL_TAGS+=("v${PW_VERSION}-focal")
-  FOCAL_TAGS+=("v${PW_VERSION}")
 fi
 
 JAMMY_TAGS=(
+  "next"
   "next-jammy"
+  "sha-${GITHUB_SHA}"
   "v${PW_VERSION}-jammy"
 )
 
 if [[ "$RELEASE_CHANNEL" == "stable" ]]; then
   JAMMY_TAGS+=("jammy")
+  JAMMY_TAGS+=("latest")
+  JAMMY_TAGS+=("v${PW_VERSION}")
+  JAMMY_TAGS+=("v${PW_VERSION}-jammy")
 fi
 
 tag_and_push() {