diff --git a/.github/workflows/docker-build-amd.yml b/.github/workflows/docker-build-amd.yml
index d1a61cf0d..4c4e9c04f 100644
--- a/.github/workflows/docker-build-amd.yml
+++ b/.github/workflows/docker-build-amd.yml
@@ -34,7 +34,9 @@ jobs:
           tags: |
             type=raw,value=latest-rocm,enable={{is_default_branch}}
             type=sha,prefix=,suffix=-rocm
-            type=semver,pattern={{version}},suffix=-rocm
+            type=match,pattern=v?(\d+\.\d+\.\d+\.\d+),group=1,suffix=-rocm
+            type=match,pattern=v?(\d+\.\d+\.\d+),group=1,suffix=-rocm
+            type=match,pattern=v?(\d+\.\d+),group=1,suffix=-rocm
       - name: Build and push ROCm (AMD) image
         uses: docker/build-push-action@v6
         with:
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index af8e27a76..861ae3dcf 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -41,8 +41,12 @@ jobs:
             type=raw,value=latest-cuda,enable={{is_default_branch}}
             type=sha,prefix=
             type=sha,prefix=,suffix=-cuda
-            type=semver,pattern={{version}}
-            type=semver,pattern={{version}},suffix=-cuda
+            type=match,pattern=v?(\d+\.\d+\.\d+\.\d+),group=1
+            type=match,pattern=v?(\d+\.\d+\.\d+\.\d+),group=1,suffix=-cuda
+            type=match,pattern=v?(\d+\.\d+\.\d+),group=1
+            type=match,pattern=v?(\d+\.\d+\.\d+),group=1,suffix=-cuda
+            type=match,pattern=v?(\d+\.\d+),group=1
+            type=match,pattern=v?(\d+\.\d+),group=1,suffix=-cuda
       - name: Build and push CUDA (NVIDIA) image
         uses: docker/build-push-action@v6
         with: