diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 46e47b1..8093fc3 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -3,7 +3,7 @@ name: Build and Push to Personal Registry
 on:
   push:
     tags:
-      - "*"
+      - v*
 
 jobs:
   docker:
@@ -29,7 +29,6 @@ jobs:
         run: docker push $IMAGE:${{ github.ref_name }}
 
       - name: Tag & push latest for release tags
-        if: startsWith(github.ref_name, 'v')
         run: |
           docker tag $IMAGE:${{ github.ref_name }} $IMAGE:latest
           docker push $IMAGE:latest