diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8005f6683..28dad0046 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -48,8 +48,8 @@ jobs:
             winglian/axolotl
             axolotlai/axolotl
           tags: |
-            type=ref,event=tag
-            type=ref,event=push
+            type=ref,event=branch
+            type=semver,pattern={{version}}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
@@ -159,8 +159,8 @@ jobs:
             winglian/axolotl-cloud-term
             axolotlai/axolotl-cloud-term
           tags: |
-            type=ref,event=tag
-            type=ref,event=push
+            type=ref,event=branch
+            type=semver,pattern={{version}}
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with: