diff --git a/dehydrate/build.sh b/dehydrate/build.sh
index 8d0a9fb..7c2b22a 100755
--- a/dehydrate/build.sh
+++ b/dehydrate/build.sh
@@ -8,9 +8,8 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
 # Debug output for CI
 echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
 
-
+# handle running locally, or docker in docker via gitea runner.
 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}"
@@ -20,16 +19,16 @@ fi
 COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
                 -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
                 -DPROJECT_NAME=${PROJECT} && \
-                cmake --build ./build"
+                cmake --build ./build" 
 
   echo "Building in new docker container"
   docker run --rm \
     --user "$(id -u):$(id -g)" \
-    ${MOUNT_CMD} \
+    "${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}"
+    bash -c "${COMMAND_TO_RUN}"
 
-[ -f "./build/${PROJECT}" ] && cp "./build/${PROJECT}" ./output/ || echo "No output file found"
+[ -f "${SCRIPT_DIR}/build/${PROJECT}" ] && cp "${SCRIPT_DIR}/build/${PROJECT}" "${SCRIPT_DIR}/output/" || echo "No output file found"
 
 echo "Build complete"
diff --git a/getpkg/build.sh b/getpkg/build.sh
index f5a7868..7c2b22a 100755
--- a/getpkg/build.sh
+++ b/getpkg/build.sh
@@ -8,9 +8,8 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
 # Debug output for CI
 echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
 
-
+# handle running locally, or docker in docker via gitea runner.
 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}"
@@ -20,16 +19,16 @@ fi
 COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
                 -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
                 -DPROJECT_NAME=${PROJECT} && \
-                cmake --build ./build"
+                cmake --build ./build" 
 
   echo "Building in new docker container"
   docker run --rm \
     --user "$(id -u):$(id -g)" \
-    ${MOUNT_CMD} \
+    "${MOUNT_CMD}" \
     -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
     gitea.jde.nz/public/dropshell-build-base:latest \
     bash -c "${COMMAND_TO_RUN}"
 
-[ -f "./build/${PROJECT}" ] && cp "./build/${PROJECT}" ./output/ || echo "No output file found"
+[ -f "${SCRIPT_DIR}/build/${PROJECT}" ] && cp "${SCRIPT_DIR}/build/${PROJECT}" "${SCRIPT_DIR}/output/" || echo "No output file found"
 
 echo "Build complete"