diff --git a/dehydrate/build.sh b/dehydrate/build.sh
index 575db41..c487bd9 100755
--- a/dehydrate/build.sh
+++ b/dehydrate/build.sh
@@ -1,9 +1,21 @@
 #!/bin/bash
 # build.sh using docker run approach
+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="dehydrate"
 
+# Debug output for CI
+echo "Build script running from: ${SCRIPT_DIR}"
+echo "Current directory: $(pwd)"
+echo "CMakeLists.txt exists: $([ -f "${SCRIPT_DIR}/CMakeLists.txt" ] && echo "yes" || echo "no")"
+
 # Create persistent build directory
 mkdir -p "${SCRIPT_DIR}/build"
 mkdir -p "${SCRIPT_DIR}/output"
diff --git a/getpkg/build.sh b/getpkg/build.sh
index e6df61e..fd6b14f 100755
--- a/getpkg/build.sh
+++ b/getpkg/build.sh
@@ -1,9 +1,21 @@
 #!/bin/bash
 # build.sh using docker run approach
+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="getpkg"
 
+# Debug output for CI
+echo "Build script running from: ${SCRIPT_DIR}"
+echo "Current directory: $(pwd)"
+echo "CMakeLists.txt exists: $([ -f "${SCRIPT_DIR}/CMakeLists.txt" ] && echo "yes" || echo "no")"
+
 # Create persistent build directory
 mkdir -p "${SCRIPT_DIR}/build"
 mkdir -p "${SCRIPT_DIR}/output"