diff --git a/.github/workflows/build-and-push-images.yml b/.github/workflows/build-and-push-images.yml
index cce1182..0f4520c 100644
--- a/.github/workflows/build-and-push-images.yml
+++ b/.github/workflows/build-and-push-images.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     tags:
-      - 'v*'
+      - '*'
   pull_request:
     branches:
       - 'master'
@@ -42,7 +42,7 @@ jobs:
             latest=false
           tags: |
             # minimal
-            type=pep440,pattern={{version}}
+            type=ref,event=tag
             # set latest tag for default branch
             type=raw,value=latest,enable={{is_default_branch}}