diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index b4586e823c..4f4f95ff82 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -55,6 +55,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=ref,event=branch
             type=sha,prefix=commit-
+            type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml
index eec8abd497..9a43a2bd27 100644
--- a/.github/workflows/config-preprocessor-build.yml
+++ b/.github/workflows/config-preprocessor-build.yml
@@ -57,6 +57,7 @@ jobs:
             type=ref,event=branch
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=sha,prefix=commit-
+            type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }}
       - name: Build and push image
         uses: docker/build-push-action@v5
         with:
diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml
index 0f162b71a0..a537b6dcd0 100644
--- a/.github/workflows/dummyPreprocessing.yml
+++ b/.github/workflows/dummyPreprocessing.yml
@@ -52,6 +52,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=ref,event=branch
             type=sha,prefix=commit-
+            type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
diff --git a/.github/workflows/ingest.yml b/.github/workflows/ingest.yml
index c1116de48b..b3449f3bce 100644
--- a/.github/workflows/ingest.yml
+++ b/.github/workflows/ingest.yml
@@ -52,6 +52,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=ref,event=branch
             type=sha,prefix=commit-
+            type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
diff --git a/.github/workflows/keycloakify-build.yml b/.github/workflows/keycloakify-build.yml
index 158b70e973..9f4eb03f69 100644
--- a/.github/workflows/keycloakify-build.yml
+++ b/.github/workflows/keycloakify-build.yml
@@ -56,6 +56,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=ref,event=branch
             type=sha,prefix=commit-
+            type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }}
       - name: Check if image exists
         id: check-image
         run: |
diff --git a/.github/workflows/preprocessing-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml
index f3b272ce35..e4d3420a4c 100644
--- a/.github/workflows/preprocessing-nextclade.yml
+++ b/.github/workflows/preprocessing-nextclade.yml
@@ -53,6 +53,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=ref,event=branch
             type=sha,prefix=commit-
+            type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index 7bd913a57c..906b767dd8 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -52,6 +52,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=ref,event=branch
             type=sha,prefix=commit-
+            type=raw,value=${{ github.ref == 'refs/heads/main' && 'main' || github.ref }}-arm,enable=${{ env.BUILD_ARM }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3