diff --git a/.gitea/workflows/build-iso-dev.yml b/.gitea/workflows/build-iso-dev.yml
index 0f6f795f..e428611b 100644
--- a/.gitea/workflows/build-iso-dev.yml
+++ b/.gitea/workflows/build-iso-dev.yml
@@ -38,6 +38,15 @@ jobs:
       - name: Run frontend tests
         run: cd neode-ui && npx vitest run
 
+      - name: Run container orchestration unit tests
+        run: |
+          source $HOME/.cargo/env 2>/dev/null || true
+          echo "=== Container crate tests ==="
+          cargo test -p archipelago-container --no-fail-fast --manifest-path core/Cargo.toml
+          echo ""
+          echo "=== Orchestration integration tests ==="
+          cargo test --test orchestration_tests --no-fail-fast --manifest-path core/Cargo.toml
+
       - name: Configure root podman for insecure registry
         run: |
           sudo mkdir -p /etc/containers/registries.conf.d
@@ -116,7 +125,7 @@ jobs:
           ISO=$(ls image-recipe/results/archipelago-installer-unbundled-*.iso 2>/dev/null | head -1)
           if [ -n "$ISO" ] && command -v qemu-system-x86_64 >/dev/null 2>&1; then
             echo "Running headless QEMU boot test..."
-            bash image-recipe/test-iso-headless.sh "$ISO" 120
+            bash image-recipe/test-iso-qemu.sh "$ISO" 120
           else
             echo "Skipping QEMU test (no ISO or QEMU not available)"
           fi