diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 13df105d3..b4586e823 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -19,7 +19,7 @@ on:
 
 env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend
-  BUILD_ARM: "true"
+  BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }}
 
 concurrency:
   group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend
diff --git a/.github/workflows/build-arm.yaml b/.github/workflows/build-arm.yaml
index 8deba3564..f582732c5 100644
--- a/.github/workflows/build-arm.yaml
+++ b/.github/workflows/build-arm.yaml
@@ -3,15 +3,6 @@
 on:
   push:
   workflow_dispatch:
-    inputs:
-      build_arm:
-        type: boolean
-        description: "Build for ARM as well"
-        default: true
-        required: false
-
-env:
-  BUILD_ARM: true
 
 permissions:
   contents: read
diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-build.yml
index e230a1376..eec8abd49 100644
--- a/.github/workflows/config-preprocessor-build.yml
+++ b/.github/workflows/config-preprocessor-build.yml
@@ -19,14 +19,14 @@ on:
 
 env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/config-processor
-  BUILD_ARM: "true"
+  BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }}
 
 defaults:
   run:
     working-directory: ./kubernetes/config-processor
 
 concurrency:
-  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-config-processor
+  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-config-processor-${{github.event.inputs.build_arm}}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummyPreprocessing.yml
index b3847be14..0f162b71a 100644
--- a/.github/workflows/dummyPreprocessing.yml
+++ b/.github/workflows/dummyPreprocessing.yml
@@ -17,13 +17,12 @@ on:
         default: false
         required: false
 
-
 env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-dummy
-  BUILD_ARM: "true"
+  BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }}
 
 concurrency:
-  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-dummy
+  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-dumm-${{github.event.inputs.build_arm}}y
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/ingest.yml b/.github/workflows/ingest.yml
index 260ecd4d6..c1116de48 100644
--- a/.github/workflows/ingest.yml
+++ b/.github/workflows/ingest.yml
@@ -18,10 +18,10 @@ on:
 
 env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/ingest
-  BUILD_ARM: "true"
+  BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }}
 
 concurrency:
-  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-ingest
+  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-ingest-${{github.event.inputs.build_arm}}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/keycloakify-build.yml b/.github/workflows/keycloakify-build.yml
index d66a97bed..158b70e97 100644
--- a/.github/workflows/keycloakify-build.yml
+++ b/.github/workflows/keycloakify-build.yml
@@ -18,10 +18,10 @@ on:
         required: false
 env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/keycloakify
-  BUILD_ARM: "true"
+  BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }}
 
 concurrency:
-  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-keycloak-build
+  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-keycloak-buil-${{github.event.inputs.build_arm}}d
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/preprocessing-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml
index e3ab6b3a3..f3b272ce3 100644
--- a/.github/workflows/preprocessing-nextclade.yml
+++ b/.github/workflows/preprocessing-nextclade.yml
@@ -19,10 +19,10 @@ on:
 
 env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-nextclade
-  BUILD_ARM: "true"
+  BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }}
 
 concurrency:
-  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-nextclade
+  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-nextclade-${{github.event.inputs.build_arm}}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index 0a0cd8712..7bd913a57 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -18,10 +18,10 @@ on:
         required: false
 env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/website
-  BUILD_ARM: "true"
+  BUILD_ARM: ${{ github.ref == 'refs/heads/main' || github.event.inputs.build_arm }}
 
 concurrency:
-  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-website
+  group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-website-${{github.event.inputs.build_arm}}
   cancel-in-progress: true
 
 jobs: