diff --git a/.github/workflows/config-preprocessor-image.yml b/.github/workflows/config-preprocessor-image.yml
index b1ed5b34ac..b786c39f3a 100644
--- a/.github/workflows/config-preprocessor-image.yml
+++ b/.github/workflows/config-preprocessor-image.yml
@@ -61,7 +61,7 @@ jobs:
         with:
           images: ${{ env.DOCKER_IMAGE_NAME }}
           tags: |
-            type=ref,event=branch
+            type=raw,value=${{ env.BRANCH_NAME }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=raw,value=commit-${{ env.sha }}
             type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }}
diff --git a/.github/workflows/ingest-image.yml b/.github/workflows/ingest-image.yml
index 9334b3d4d6..8a8cb83523 100644
--- a/.github/workflows/ingest-image.yml
+++ b/.github/workflows/ingest-image.yml
@@ -57,7 +57,7 @@ jobs:
           tags: |
             type=raw,value=${{ env.DIR_HASH }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
-            type=ref,event=branch
+            type=raw,value=${{ env.BRANCH_NAME }}
             type=raw,value=commit-${{ env.sha }}
             type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }}
 
diff --git a/.github/workflows/keycloakify-image.yml b/.github/workflows/keycloakify-image.yml
index 09ae7844ce..150cd9200f 100644
--- a/.github/workflows/keycloakify-image.yml
+++ b/.github/workflows/keycloakify-image.yml
@@ -61,7 +61,7 @@ jobs:
           tags: |
             type=raw,value=${{ env.DIR_HASH }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
-            type=ref,event=branch
+            type=raw,value=${{ env.BRANCH_NAME }}
             type=raw,value=commit-${{ env.sha }}
             type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }}
       - name: Check if image exists
diff --git a/.github/workflows/preprocessing-dummy-image.yml b/.github/workflows/preprocessing-dummy-image.yml
index fb34b48b42..d56cb9ffc2 100644
--- a/.github/workflows/preprocessing-dummy-image.yml
+++ b/.github/workflows/preprocessing-dummy-image.yml
@@ -57,7 +57,7 @@ jobs:
           tags: |
             type=raw,value=${{ env.DIR_HASH }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
-            type=ref,event=branch
+            type=raw,value=${{ env.BRANCH_NAME }}
             type=raw,value=commit-${{ env.sha }}
             type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }}
 
diff --git a/.github/workflows/preprocessing-nextclade-image.yml b/.github/workflows/preprocessing-nextclade-image.yml
index a622768b27..f8c068a867 100644
--- a/.github/workflows/preprocessing-nextclade-image.yml
+++ b/.github/workflows/preprocessing-nextclade-image.yml
@@ -58,7 +58,7 @@ jobs:
           tags: |
             type=raw,value=${{ env.DIR_HASH }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
-            type=ref,event=branch
+            type=raw,value=${{ env.BRANCH_NAME }}
             type=raw,value=commit-${{ env.sha }}
             type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }}
 
diff --git a/.github/workflows/website-image.yml b/.github/workflows/website-image.yml
index 05089d7ad3..2c757a78fc 100644
--- a/.github/workflows/website-image.yml
+++ b/.github/workflows/website-image.yml
@@ -58,7 +58,7 @@ jobs:
           tags: |
             type=raw,value=${{ env.DIR_HASH }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
-            type=ref,event=branch
+            type=raw,value=${{ env.BRANCH_NAME }}
             type=raw,value=commit-${{ env.sha }}
             type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }}