diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 92dd4d92eb..6c32a4c6e1 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -156,10 +156,14 @@ jobs:
           outputs: type=image,name=${{ env.REGISTRY_FRONTEND_IMAGE }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
+#        run: |
+#          mkdir -p /tmp/digests
+#          digest="${{ steps.build.outputs.digest }}"
+#          touch "/tmp/digests/${digest#sha256:}"
         run: |
           mkdir -p /tmp/digests
           digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
+          echo "${digest#sha256:}" > "/tmp/digests/${{ env.PLATFORM_PAIR }}"
 
       - name: Upload digest
         uses: actions/upload-artifact@v4
@@ -233,13 +237,24 @@ jobs:
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY_FRONTEND_IMAGE }}@sha256:%s ' *) \
-
-      - name: Create manifest list and push 2
-        working-directory: /tmp/digests
-        run: |
-          docker buildx imagetools create --tag ${{ env.REGISTRY_FRONTEND_IMAGE }}:${{ env.FINAL_TAG }}
+          DIGEST_FILES=$(ls /tmp/digests/frontend-${{ matrix.configuration.build_configuration }}-digests-*)
+          if [[ -z "$DIGEST_FILES" ]]; then
+          echo "No digests found!"
+          exit 1
+          fi
+          DIGESTS=""
+          for digest in $DIGEST_FILES; do
+          DIGESTS="$DIGESTS ${{ env.REGISTRY_FRONTEND_IMAGE }}@sha256:$(cat $digest)"
+          done
+          docker buildx imagetools create --tag ${{ env.REGISTRY_FRONTEND_IMAGE }}:${{ env.FINAL_TAG }} $DIGESTS
+#        run: |
+#          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+#            $(printf '${{ env.REGISTRY_FRONTEND_IMAGE }}@sha256:%s ' *) \
+
+#      - name: Create manifest list and push 2
+#        working-directory: /tmp/digests
+#        run: |
+#          docker buildx imagetools create --tag ${{ env.REGISTRY_FRONTEND_IMAGE }}:${{ env.FINAL_TAG }}
 
       - name: Inspect image
         run: |
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index ece84a24fa..a943b9827c 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,4 +1,5 @@
 FROM node:18 AS BUILD_IMAGE
+# Doesn't matter what we put here - it get's overwritten by the docker build command
 ARG BUILD_CONFIGURATION=staging
 WORKDIR /app
 COPY . .
diff --git a/frontend/package.json b/frontend/package.json
index eb7daa42de..2356fb66f4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "scripts": {
     "install:deps": "npm install",
     "start": "npm install && ng serve --configuration local --open",