diff --git a/buildtestpublish_all.sh b/buildtestpublish_all.sh
index 2015927..2e84401 100755
--- a/buildtestpublish_all.sh
+++ b/buildtestpublish_all.sh
@@ -109,7 +109,7 @@ function buildtestpublish() {
     # Add to projects list
     PROJECTS+=("$TOOLNAME")
 
-    cd "$dir" || echo "Failed to cd to $dir"
+    #cd "$dir" || echo "Failed to cd to $dir"
 
     subtitle "🔨 BUILDING $TOOLNAME_UPPER 🔨"
     if dothis build "$dir" "$TOOLNAME"; then
diff --git a/getpkg/build.sh b/getpkg/build.sh
index b41594a..1cdf942 100755
--- a/getpkg/build.sh
+++ b/getpkg/build.sh
@@ -2,27 +2,12 @@
 set -euo pipefail
 
 # Get script directory - handle different execution contexts
-if [ -n "${BASH_SOURCE[0]}" ]; then
-    SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-else
-    SCRIPT_DIR="$( cd "$( dirname "$0" )" &> /dev/null && pwd )"
-fi
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
 
-
 # Debug output for CI
 echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
 
-MAIN_DIR="${SCRIPT_DIR}"
-if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
-  MAIN_DIR="/runner/${PROJECT}"
-
-  mkdir -p "${MAIN_DIR}"
-  cp -r "${SCRIPT_DIR}/*" "${MAIN_DIR}/"
-  mkdir -p "${MAIN_DIR}/build"
-  mkdir -p "${MAIN_DIR}/output"
-fi
-
 # Run build in container with mounted directories
 COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
                 -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
@@ -33,16 +18,9 @@ COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
   echo "Building in new docker container"
   docker run --rm \
     --user "$(id -u):$(id -g)" \
-    -v "${MAIN_DIR}:/app:ro" \
-    -v "${MAIN_DIR}/build:/app/build" \
-    -v "${MAIN_DIR}/output:/app/output" \
+    -v "${SCRIPT_DIR}:/app" \
     -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
     gitea.jde.nz/public/dropshell-build-base:latest \
     bash -c "cd /app && ${COMMAND_TO_RUN}"
 
-if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
-  cp -r "${MAIN_DIR}/output/*" "${SCRIPT_DIR}/output/"
-  rm -rf "${MAIN_DIR}"
-fi
-
 echo "Build complete"