diff --git a/.gitignore b/.gitignore
index 278a03ed13ead..236e2672abb45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,4 +54,5 @@ lib*.pc
 /pglite/dist/**
 /pglite/patches
 /patches/
-/dist/pglite
\ No newline at end of file
+/dist/pglite
+/dist
\ No newline at end of file
diff --git a/pglite-wasm b/pglite-wasm
new file mode 120000
index 0000000000000..e2e295215d816
--- /dev/null
+++ b/pglite-wasm
@@ -0,0 +1 @@
+./pglite-REL_17_4_WASM
\ No newline at end of file
diff --git a/wasm-build.sh b/wasm-build.sh
index 24176b10a7a54..c728455aca027 100755
--- a/wasm-build.sh
+++ b/wasm-build.sh
@@ -40,8 +40,8 @@ export PGUSER=${PGUSER:-postgres}
 
 if $DEBUG
 then
-    export COPTS=${COPTS:-"-O2 -g3"}
-    export LOPTS=${LOPTS:-"-O2 -g3 --no-wasm-opt -sASSERTIONS=1"}
+    export COPTS=${COPTS:-"-g3"}
+    export LOPTS=${LOPTS:-"-g3 --no-wasm-opt -sASSERTIONS=1"}
 else
     # DO NOT CHANGE COPTS - optimized wasm corruption fix
     export COPTS=${COPTS:-"-O2 -g3 --no-wasm-opt"}
@@ -432,7 +432,7 @@ fi
 # only build extra when targeting pglite-wasm .
 
 # TODO link the good tag
-ln -s ${WORKSPACE}/pglite-REL_17_4_WASM ${WORKSPACE}/pglite-wasm
+ln -s ${WORKSPACE}/pglite-REL_17_4_WASM ${WORKSPACE}/pglite-wasm || true
 
 if [ -f  ${WORKSPACE}/pglite-wasm/build.sh ]
 then
diff --git a/wasm-build/build-with-docker.sh b/wasm-build/build-with-docker.sh
index 2da234e657338..c56a5c079f4c7 100755
--- a/wasm-build/build-with-docker.sh
+++ b/wasm-build/build-with-docker.sh
@@ -22,7 +22,7 @@ cat .buildconfig
 docker run \
   --rm \
   --env-file .buildconfig \
-  -v .:/workspace:rw \
+  -v .:/tmp-workspace:ro \
   -v ./dist:/tmp/sdk/dist:rw \
   $IMG_NAME:$IMG_TAG \
-  bash -c "source ${SDKROOT}/wasm32-bi-emscripten-shell.sh && ./wasm-build.sh ${WHAT:-\"contrib extra\"}"
+  bash -c "cp -r /tmp-workspace/. /workspace && cd /workspace && source ${SDKROOT}/wasm32-bi-emscripten-shell.sh && ./wasm-build.sh ${WHAT:-\"contrib extra\"}"