diff --git a/.gitea/workflows/dropshell-build.yaml b/.gitea/workflows/dropshell-build.yaml
index 9d45780..a89b2cc 100644
--- a/.gitea/workflows/dropshell-build.yaml
+++ b/.gitea/workflows/dropshell-build.yaml
@@ -1,4 +1,4 @@
-name: dropshell-build
+name: dropshell-build multiarch
 run-name: Build test and publish dropshell-build
 
 on: [push]
@@ -39,3 +39,21 @@ jobs:
           SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} \
           DOCKER_PUSH_TOKEN=${{ secrets.DOCKER_PUSH_TOKEN }} \
           ./publish.sh
+  create-manifest:
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create manifest list
+        run: |
+          docker manifest create gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA} \
+            gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA}-x86_64 \
+            gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA}-aarch64
+          docker manifest push gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA}
+          
+          # Also tag as latest if on main branch
+          if [ "$GITHUB_REF" = "refs/heads/main" ]; then
+            docker manifest create gitea.jde.nz/public/dropshell-build-base:latest \
+              gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA}-x86_64 \
+              gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA}-aarch64
+            docker manifest push gitea.jde.nz/public/dropshell-build-base:latest
+          fi
diff --git a/tests/build.sh b/tests/build.sh
index dac7e1b..c7fb2f6 100755
--- a/tests/build.sh
+++ b/tests/build.sh
@@ -20,7 +20,7 @@ build_project() {
         -t "${tag}" \
         -f "${SCRIPT_DIR}/Dockerfile.test-build" \
         --build-arg PROJECT="${project}" \
-        --build-arg CMAKE_BUILD_TYPE="${build_type}" \
+        --build-arg CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
         --output "${output_dir}" \
         "${SCRIPT_DIR}/tests/${project}"
 }