diff --git a/dehydrate/build.sh b/dehydrate/build.sh
index 3dee9bb..9b95606 100755
--- a/dehydrate/build.sh
+++ b/dehydrate/build.sh
@@ -16,18 +16,19 @@ echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
 mkdir -p "${SCRIPT_DIR}/build"
 mkdir -p "${SCRIPT_DIR}/output"
 
+cd "${SCRIPT_DIR}" || exit 1
+
 # Run build in container with mounted directories
 docker run --rm \
   --user "$(id -u):$(id -g)" \
-  -v "${SCRIPT_DIR}:/app" \
-  -w /app \
+  -v ".:/app" \
   -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
   gitea.jde.nz/public/dropshell-build-base:latest \
   bash -c "
-    cd /app/build && \
+    cd /app && ls -la && \
     cmake -G Ninja -S /app -B /app/build \
       -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
       -DPROJECT_NAME=${PROJECT} && \
     cmake --build /app/build && \
-    cp ${PROJECT} /app/output/
+    cp /app/build/${PROJECT} /app/output/
   "
diff --git a/getpkg/build.sh b/getpkg/build.sh
index 6a3a8fd..9b95606 100755
--- a/getpkg/build.sh
+++ b/getpkg/build.sh
@@ -16,10 +16,12 @@ echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
 mkdir -p "${SCRIPT_DIR}/build"
 mkdir -p "${SCRIPT_DIR}/output"
 
+cd "${SCRIPT_DIR}" || exit 1
+
 # Run build in container with mounted directories
 docker run --rm \
   --user "$(id -u):$(id -g)" \
-  -v "${SCRIPT_DIR}:/app" \
+  -v ".:/app" \
   -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
   gitea.jde.nz/public/dropshell-build-base:latest \
   bash -c "