diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ece3714..6e8bfcc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,9 +28,8 @@ jobs:
         with:
           images: michaelwoods/onstar2mqtt
           tags: |
+            type=ref,event=branch
             type=schedule,pattern=weekly
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
             type=sha
 
       - name: Use Node.js ${{ matrix.node-version }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 47ef442..fe133bb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,6 +16,9 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: michaelwoods/onstar2mqtt
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1.2.0