diff --git a/.gitea/workflows/release-gates.yml b/.gitea/workflows/release-gates.yml
index 2abcd2c4..24f4c36b 100644
--- a/.gitea/workflows/release-gates.yml
+++ b/.gitea/workflows/release-gates.yml
@@ -21,6 +21,8 @@ jobs:
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Secret scan
         uses: trufflesecurity/trufflehog@v3.79.0
         with:
diff --git a/scripts/generate_container_sbom.sh b/scripts/generate_container_sbom.sh
index 9285bb2b..aef46b7d 100644
--- a/scripts/generate_container_sbom.sh
+++ b/scripts/generate_container_sbom.sh
@@ -15,10 +15,16 @@ esac
 
 docker image inspect "$TARGET_IMAGE" >/dev/null
 mkdir -p "$ROOT/$(dirname "$OUTPUT")"
+WORKDIR="/workspace"
+WORKSPACE_ARGS=(-v "$ROOT:/workspace")
+if docker inspect "${HOSTNAME:-}" >/dev/null 2>&1; then
+  WORKDIR="$ROOT"
+  WORKSPACE_ARGS=(--volumes-from "$HOSTNAME")
+fi
 docker run --rm \
   -v /var/run/docker.sock:/var/run/docker.sock \
-  -v "$ROOT:/workspace" \
-  -w /workspace \
+  "${WORKSPACE_ARGS[@]}" \
+  -w "$WORKDIR" \
   "$SYFT_IMAGE" \
   "$TARGET_IMAGE" \
   -o "spdx-json=$OUTPUT"
diff --git a/scripts/scan_container_image.sh b/scripts/scan_container_image.sh
index 87b5406a..4eb478c6 100644
--- a/scripts/scan_container_image.sh
+++ b/scripts/scan_container_image.sh
@@ -7,8 +7,7 @@ OUTPUT="${2:-artifacts/geointel-container-vulnerabilities.json}"
 TRIVY_IMAGE="aquasec/trivy:0.70.0@sha256:be1190afcb28352bfddc4ddeb71470835d16462af68d310f9f4bca710961a41e"
 CACHE_DIR="${GEOINTEL_TRIVY_CACHE:-$ROOT/.cache/trivy}"
 PYTHON_CMD="${PYTHON_BIN:-python3}"
-IGNORE_FILE="$(mktemp)"
-CONTAINER_IGNORE_FILE="/tmp/geointel-trivy-ignore.txt"
+IGNORE_FILE="$CACHE_DIR/geointel-trivy-ignore.txt"
 trap 'rm -f "$IGNORE_FILE"' EXIT
 
 case "$OUTPUT" in
@@ -20,6 +19,14 @@ esac
 
 docker image inspect "$TARGET_IMAGE" >/dev/null
 mkdir -p "$ROOT/$(dirname "$OUTPUT")" "$CACHE_DIR"
+WORKDIR="/workspace"
+WORKSPACE_ARGS=(-v "$ROOT:/workspace")
+if docker inspect "${HOSTNAME:-}" >/dev/null 2>&1; then
+  WORKDIR="$ROOT"
+  WORKSPACE_ARGS=(--volumes-from "$HOSTNAME")
+fi
+CONTAINER_CACHE_DIR="$WORKDIR/.cache/trivy"
+CONTAINER_IGNORE_FILE="$CONTAINER_CACHE_DIR/geointel-trivy-ignore.txt"
 "$PYTHON_CMD" "$ROOT/scripts/verify_security_exceptions.py"
 "$PYTHON_CMD" "$ROOT/scripts/verify_security_exceptions.py" \
   --print-container-ids > "$IGNORE_FILE"
@@ -27,15 +34,15 @@ mkdir -p "$ROOT/$(dirname "$OUTPUT")" "$CACHE_DIR"
 # Keep the complete report, including vulnerabilities without an available fix.
 docker run --rm \
   -v /var/run/docker.sock:/var/run/docker.sock \
-  -v "$ROOT:/workspace" \
-  -v "$CACHE_DIR:/root/.cache/trivy" \
+  "${WORKSPACE_ARGS[@]}" \
   "$TRIVY_IMAGE" \
   image \
   --scanners vuln \
   --timeout 20m \
   --skip-version-check \
   --format json \
-  --output "/workspace/$OUTPUT" \
+  --cache-dir "$CONTAINER_CACHE_DIR" \
+  --output "$WORKDIR/$OUTPUT" \
   "$TARGET_IMAGE"
 
 # Release policy: fixed HIGH/CRITICAL findings block the build. Unfixed findings
@@ -44,14 +51,14 @@ docker run --rm \
 # but the final filesystem replaces it with the audited setpriv shell wrapper.
 docker run --rm \
   -v /var/run/docker.sock:/var/run/docker.sock \
-  -v "$CACHE_DIR:/root/.cache/trivy" \
-  -v "$IGNORE_FILE:$CONTAINER_IGNORE_FILE:ro" \
+  "${WORKSPACE_ARGS[@]}" \
   "$TRIVY_IMAGE" \
   image \
   --scanners vuln \
   --timeout 20m \
   --skip-version-check \
   --ignore-unfixed \
+  --cache-dir "$CONTAINER_CACHE_DIR" \
   --ignorefile "$CONTAINER_IGNORE_FILE" \
   --skip-files /usr/local/bin/gosu \
   --severity HIGH,CRITICAL \