diff --git a/.github/workflows/bin-image.yml b/.github/workflows/bin-image.yml
index edff279c40..879da49523 100644
--- a/.github/workflows/bin-image.yml
+++ b/.github/workflows/bin-image.yml
@@ -22,6 +22,7 @@ on:
       - '[0-9]+.x'
     tags:
       - 'v*'
+      - 'docker-v*'
   pull_request:
 
 env:
@@ -69,11 +70,11 @@ jobs:
           ## push on 28.x branch
           # moby/moby-bin:28.x
           tags: |
-            type=semver,pattern={{version}}
             type=ref,event=branch
             type=ref,event=pr
-            type=semver,pattern={{major}}
-            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{version}},match=docker-(.*)
+            type=semver,pattern={{major}}.{{minor}},match=docker-(.*)
+            type=semver,pattern={{major}},match=docker-(.*)
       -
         name: Rename meta bake definition file
         # see https://github.com/docker/metadata-action/issues/381#issuecomment-1918607161
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 914556d482..bdb617c48f 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -17,6 +17,7 @@ on:
       - '[0-9]+.x'
     tags:
       - 'v*'
+      - 'docker-v*'
   pull_request:
     # The branches below must be a subset of the branches above
     branches: ["master"]
diff --git a/hack/make.sh b/hack/make.sh
index 50e89fc24f..275e4651e4 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -40,6 +40,7 @@ DEFAULT_BUNDLES=(
 
 VERSION=${VERSION:-dev}
 case "$VERSION" in
+	refs/tags/docker-v*) VERSION=${VERSION#refs/tags/docker-v} ;;
 	refs/tags/v*) VERSION=${VERSION#refs/tags/v} ;;
 	refs/tags/*) VERSION=${VERSION#refs/tags/} ;;
 	refs/heads/*) VERSION=$(echo "${VERSION#refs/heads/}" | sed -r 's#/+#-#g') ;;