diff --git a/Dockerfile.dropshell-build b/Dockerfile.dropshell-build
index e0df573..74142a3 100644
--- a/Dockerfile.dropshell-build
+++ b/Dockerfile.dropshell-build
@@ -1,6 +1,7 @@
 FROM --platform=$BUILDPLATFORM gitea.jde.nz/public/dropshell-build-base:latest AS builder
 
 ARG PROJECT
+ARG CMAKE_BUILD_TYPE=Debug
 
 # Set working directory
 WORKDIR /app
@@ -14,7 +15,9 @@ RUN  --mount=type=cache,target=/build \
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-    -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold -static" \
+    -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold -static -g" \
+    -DCMAKE_CXX_FLAGS="-g -fno-omit-frame-pointer" \
+    -DCMAKE_C_FLAGS="-g -fno-omit-frame-pointer" \
     -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
     -DZLIB_BUILD_SHARED=OFF \
     -DZLIB_BUILD_STATIC=ON \
diff --git a/build.sh b/build.sh
index a9c535b..f17abbf 100755
--- a/build.sh
+++ b/build.sh
@@ -15,6 +15,7 @@ docker build \
   -t "gitea.jde.nz/public/${PROJECT}-build:latest" \
   -f "${SCRIPT_DIR}/Dockerfile.dropshell-build" \
   --build-arg PROJECT="${PROJECT}" \
+  --build-arg CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
   --output "${SCRIPT_DIR}/output" \
   "${SCRIPT_DIR}/tests/${PROJECT}"
 
@@ -23,5 +24,6 @@ docker build \
   -t "gitea.jde.nz/public/${PROJECT}-build:latest" \
   -f "${SCRIPT_DIR}/Dockerfile.dropshell-build" \
   --build-arg PROJECT="${PROJECT}" \
+  --build-arg CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
   --output "${SCRIPT_DIR}/output" \
   "${SCRIPT_DIR}/tests/${PROJECT}"