diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 0f3c7da..9cf9df4 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -202,18 +202,13 @@ jobs:
             org.opencontainers.image.title=${{ env.IMAGE_NAME }}
             org.opencontainers.image.version=${{ env.IMAGE_VERSION }}
           tags: |
-            # SHA tag (short)
             type=sha,format=short,suffix=-${{ env.TAG_VERSION }}
-            # PR tag
             type=ref,event=pr,suffix=-${{ env.TAG_VERSION }}
             # Tags only for push to main or workflow_dispatch on main
-            # TAG_VERSION, COREOS_VERSION-TIMESTAMP
-            ${{ ((github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main') && format('type=raw,value={0},priority=800\ntype=raw,value={0}-{1},priority=700', env.TAG_VERSION, env.TIMESTAMP) || '' }}
-            # TAG_VERSION-zfs, TAG_VERSION-zfs-TIMESTAMP
-            ${{ ((github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main') && format('type=raw,value={0}-zfs\ntype=raw,value={0}-zfs-{1}', env.TAG_VERSION, env.TIMESTAMP) || '' }}
-            # only stable or testing
-            type=raw,value=${{ env.TAG_VERSION }},enable=${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' && (env.TAG_VERSION == 'stable' || env.TAG_VERSION == 'testing') }}
-            # latest only for TAG_VERSION=stable
+            type=raw,value=${{ env.TAG_VERSION }}-${{ env.TIMESTAMP }},priority=750,enable=${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' }}
+            type=raw,value=${{ env.TAG_VERSION }},priority=350,enable=${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' }}
+            type=raw,value=${{ env.TAG_VERSION }}-zfs-${{ env.TIMESTAMP }},priority=700,enable=${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' }}
+            type=raw,value=${{ env.TAG_VERSION }}-zfs,priority=300,enable=${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' }}
             type=raw,value=latest,enable=${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' && env.TAG_VERSION == 'stable' }}
 
       # Build image using Buildah action