diff --git a/dehydrate/build.sh b/dehydrate/build.sh
index 1cdf942..8d0a9fb 100755
--- a/dehydrate/build.sh
+++ b/dehydrate/build.sh
@@ -8,19 +8,28 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
 # Debug output for CI
 echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
 
+
+MOUNT_CMD="-v ${SCRIPT_DIR}:/app -w /app"
+
+if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
+  echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
+  MOUNT_CMD="--volumes-from=${GITEA_CONTAINER_NAME} -w ${GITHUB_WORKSPACE}/${PROJECT}"
+fi
+
 # Run build in container with mounted directories
 COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
                 -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
                 -DPROJECT_NAME=${PROJECT} && \
-                cmake --build ./build && \
-                cp ./build/${PROJECT} ./output/"
+                cmake --build ./build"
 
   echo "Building in new docker container"
   docker run --rm \
     --user "$(id -u):$(id -g)" \
-    -v "${SCRIPT_DIR}:/app" \
+    ${MOUNT_CMD} \
     -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
     gitea.jde.nz/public/dropshell-build-base:latest \
     bash -c "cd /app && ${COMMAND_TO_RUN}"
 
+[ -f "./build/${PROJECT}" ] && cp "./build/${PROJECT}" ./output/ || echo "No output file found"
+
 echo "Build complete"
diff --git a/getpkg/build.sh b/getpkg/build.sh
index 1cdf942..8d0a9fb 100755
--- a/getpkg/build.sh
+++ b/getpkg/build.sh
@@ -8,19 +8,28 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
 # Debug output for CI
 echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
 
+
+MOUNT_CMD="-v ${SCRIPT_DIR}:/app -w /app"
+
+if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
+  echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
+  MOUNT_CMD="--volumes-from=${GITEA_CONTAINER_NAME} -w ${GITHUB_WORKSPACE}/${PROJECT}"
+fi
+
 # Run build in container with mounted directories
 COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
                 -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
                 -DPROJECT_NAME=${PROJECT} && \
-                cmake --build ./build && \
-                cp ./build/${PROJECT} ./output/"
+                cmake --build ./build"
 
   echo "Building in new docker container"
   docker run --rm \
     --user "$(id -u):$(id -g)" \
-    -v "${SCRIPT_DIR}:/app" \
+    ${MOUNT_CMD} \
     -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
     gitea.jde.nz/public/dropshell-build-base:latest \
     bash -c "cd /app && ${COMMAND_TO_RUN}"
 
+[ -f "./build/${PROJECT}" ] && cp "./build/${PROJECT}" ./output/ || echo "No output file found"
+
 echo "Build complete"