diff --git a/wasm-build.sh b/wasm-build.sh
index 8a5fa04e008cc..4e026147fb11f 100755
--- a/wasm-build.sh
+++ b/wasm-build.sh
@@ -64,8 +64,9 @@ else
     BUILD=emscripten
     if $DEBUG
     then
-        export COPTS="-O2 -g3 --no-wasm-opt"
-        export LOPTS=${LOPTS:-"-O2 -g3 --no-wasm-opt -sASSERTIONS=1"}
+        # clang default to O0 but specifying -O0 may trigger memory start address bug in emsdk
+        export COPTS="-g3 --no-wasm-opt"
+        export LOPTS=${LOPTS:-"-g3 --no-wasm-opt -sASSERTIONS=1"}
     else
         # DO NOT CHANGE COPTS - optimized wasm corruption fix
         export COPTS="-O2 -g3 --no-wasm-opt"
diff --git a/wasm-build/build-with-docker.sh b/wasm-build/build-with-docker.sh
index 63b0f57a1f94b..2bd510adeceea 100755
--- a/wasm-build/build-with-docker.sh
+++ b/wasm-build/build-with-docker.sh
@@ -9,6 +9,9 @@ IMG_TAG="17.4_3.1.61.7bi"
 
 export WORKSPACE=${GITHUB_WORKSPACE:-$(pwd)}
 
+# normally would default to /workspace but that may cause trouble with debug paths in some IDE
+export DOCKER_WORKSPACE=${DOCKER_WORKSPACE:-$WORKSPACE}
+
 cd $(realpath ${WORKSPACE}/postgres-pglite)
 
 [ -f ${BUILD_CONFIG:-postgres-pglite}/.buildconfig ] && cp ${BUILD_CONFIG:-postgres-pglite}/.buildconfig .buildconfig
@@ -32,8 +35,8 @@ fi
 docker run $@ \
   --rm \
   --env-file .buildconfig \
-  --workdir=/workspace \
-  -v ${WORKSPACE}/postgres-pglite:/workspace:rw \
+  --workdir=${DOCKER_WORKSPACE} \
+  -v ${WORKSPACE}/postgres-pglite:${DOCKER_WORKSPACE}:rw \
   -v ${WORKSPACE}/postgres-pglite/dist:/tmp/sdk/dist:rw \
   $IMG_NAME:$IMG_TAG \
   bash --noprofile --rcfile ${SDKROOT}/wasm32-bi-emscripten-shell.sh -ci "( ./wasm-build.sh ${WHAT:-\"contrib extra\"} $PROMPT"