diff --git a/.github/workflows/dev-push-to-hub.yml b/.github/workflows/bake-push-to-hub.yml
similarity index 91%
rename from .github/workflows/dev-push-to-hub.yml
rename to .github/workflows/bake-push-to-hub.yml
index ed78c9dc7..eb6dd9168 100644
--- a/.github/workflows/dev-push-to-hub.yml
+++ b/.github/workflows/bake-push-to-hub.yml
@@ -5,6 +5,8 @@ on:
   push:
     branches:
       - "dev"
+    tags:
+      - "v*"
 
 jobs:
   Bake-Push-Images:
@@ -33,9 +35,9 @@ jobs:
             *.cache-from=type=gha
             *.cache-to=type=gha,mode=max
         env:
-          TAG: dev
+          TAG: ${{ github.ref_name }}
           GIT_SHA: ${{ github.sha }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/dev' }}
+  cancel-in-progress: true
diff --git a/.github/workflows/main-push-to-hub.yml b/.github/workflows/latest-push-to-hub.yml
similarity index 100%
rename from .github/workflows/main-push-to-hub.yml
rename to .github/workflows/latest-push-to-hub.yml