diff --git a/.github/workflows/backend-image.yml b/.github/workflows/backend-image.yml
index afc757e714..145dacc279 100644
--- a/.github/workflows/backend-image.yml
+++ b/.github/workflows/backend-image.yml
@@ -24,7 +24,7 @@ env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/backend
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }}
-  sha: ${{ github.event.pull_request.base.sha || github.sha }}
+  sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
 concurrency:
   group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-backend
@@ -59,7 +59,7 @@ jobs:
             type=raw,value=${{ env.DIR_HASH }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=ref,event=branch
-            type=raw,prefix=commit-${{ env.sha }}
+            type=raw,value=commit-${{ env.sha }}
             type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
diff --git a/.github/workflows/config-preprocessor-image.yml b/.github/workflows/config-preprocessor-image.yml
index 1d5dcf338e..bb0c16fd86 100644
--- a/.github/workflows/config-preprocessor-image.yml
+++ b/.github/workflows/config-preprocessor-image.yml
@@ -24,7 +24,7 @@ env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/config-processor
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }}
-  sha: ${{ github.event.pull_request.base.sha || github.sha }}
+  sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
 defaults:
   run:
diff --git a/.github/workflows/e2e-k3d.yml b/.github/workflows/e2e-k3d.yml
index 57c00b59b3..a0c224f92e 100644
--- a/.github/workflows/e2e-k3d.yml
+++ b/.github/workflows/e2e-k3d.yml
@@ -38,7 +38,7 @@ jobs:
 
     env:
       ALL_BROWSERS: ${{ github.ref == 'refs/heads/main' || github.event.inputs.all_browsers && 'true' || 'false' }}
-      sha: ${{ github.event.pull_request.base.sha || github.sha }}
+      sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
     steps:
       - name: Collect Workflow Telemetry
diff --git a/.github/workflows/ingest-image.yml b/.github/workflows/ingest-image.yml
index 236b5c6553..fa887c0ab8 100644
--- a/.github/workflows/ingest-image.yml
+++ b/.github/workflows/ingest-image.yml
@@ -23,7 +23,7 @@ env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/ingest
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }}
-  sha: ${{ github.event.pull_request.base.sha || github.sha }}
+  sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
 concurrency:
   group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-ingest-${{github.event.inputs.build_arm}}
diff --git a/.github/workflows/keycloakify-image.yml b/.github/workflows/keycloakify-image.yml
index 74eb65bdec..82d3a23ed8 100644
--- a/.github/workflows/keycloakify-image.yml
+++ b/.github/workflows/keycloakify-image.yml
@@ -23,7 +23,7 @@ env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/keycloakify
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }}
-  sha: ${{ github.event.pull_request.base.sha || github.sha }}
+  sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
 concurrency:
   group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-keycloak-buil-${{github.event.inputs.build_arm}}d
diff --git a/.github/workflows/preprocessing-dummy-image.yml b/.github/workflows/preprocessing-dummy-image.yml
index a92c275706..25093815ed 100644
--- a/.github/workflows/preprocessing-dummy-image.yml
+++ b/.github/workflows/preprocessing-dummy-image.yml
@@ -24,7 +24,7 @@ env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-dummy
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }}
-  sha: ${{ github.event.pull_request.base.sha || github.sha }}
+  sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
 concurrency:
   group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-dumm-${{github.event.inputs.build_arm}}y
diff --git a/.github/workflows/preprocessing-nextclade-image.yml b/.github/workflows/preprocessing-nextclade-image.yml
index 23a72fdf2e..5f7dcddef4 100644
--- a/.github/workflows/preprocessing-nextclade-image.yml
+++ b/.github/workflows/preprocessing-nextclade-image.yml
@@ -24,7 +24,7 @@ env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/preprocessing-nextclade
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }}
-  sha: ${{ github.event.pull_request.base.sha || github.sha }}
+  sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
 concurrency:
   group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-preprocessing-nextclade-${{github.event.inputs.build_arm}}
diff --git a/.github/workflows/website-image.yml b/.github/workflows/website-image.yml
index 7f9fde8c01..05089d7ad3 100644
--- a/.github/workflows/website-image.yml
+++ b/.github/workflows/website-image.yml
@@ -1,4 +1,4 @@
-name: website
+name: website-image
 
 on:
   pull_request:
@@ -23,7 +23,7 @@ env:
   DOCKER_IMAGE_NAME: ghcr.io/loculus-project/website
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   BUILD_ARM: ${{ github.event.inputs.build_arm || inputs.build_arm || github.ref == 'refs/heads/main' }}
-  sha: ${{ github.event.pull_request.base.sha || github.sha }}
+  sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
 concurrency:
   group: ci-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}-website-${{github.event.inputs.build_arm}}