diff --git a/.github/workflows/buildimage.yml b/.github/workflows/buildimage.yml
index 72f70cf..3236e74 100644
--- a/.github/workflows/buildimage.yml
+++ b/.github/workflows/buildimage.yml
@@ -1,6 +1,9 @@
 name: BuildImage
 
 on:
+  push:
+    tags:
+      - 'c*.*.*'
   workflow_dispatch:
     inputs:
       cmake-version:
@@ -17,6 +20,10 @@ jobs:
     outputs:
       digest: ${{ steps.build_multi_arch_images.outputs.digest }}
     steps:
+      # Extract version for docker tag
+      - name: Get version
+        run: echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
 
@@ -40,6 +47,7 @@ jobs:
           tags: |
             atsigncompany/cbuildimage:latest
             atsigncompany/cbuildimage:GHA_${{ github.run_number }}
+            atsigncompany/cbuildimage:CMake-${{ env.VERSION }}
           platforms: |
             linux/amd64
             linux/arm64/v8