diff --git a/components/ide/code/leeway.Dockerfile b/components/ide/code/leeway.Dockerfile
index 9834678b05d08f..73480dd81a2797 100644
--- a/components/ide/code/leeway.Dockerfile
+++ b/components/ide/code/leeway.Dockerfile
@@ -42,7 +42,7 @@ RUN curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh |
     && npm install -g yarn node-gyp
 ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
 
-ENV GP_CODE_COMMIT bcd47c10d173a0c5cb174ab7451bb5133c4e9bec
+ENV GP_CODE_COMMIT bd7b4627aa9426570398a32606bda2d9246a4e52
 RUN mkdir gp-code \
     && cd gp-code \
     && git init \
diff --git a/components/ide/code/startup.sh b/components/ide/code/startup.sh
index 651cfd4ba2d1ac..a3bb8968a5a519 100755
--- a/components/ide/code/startup.sh
+++ b/components/ide/code/startup.sh
@@ -33,4 +33,8 @@ export USER=gitpod
 [ -s ~/.nvm/nvm-lazy.sh ] && source /home/gitpod/.nvm/nvm-lazy.sh
 
 cd /ide || exit
-exec /ide/node/bin/gitpod-node ./out/gitpod.js "$@"
+if [ "$SUPERVISOR_DEBUG_ENABLE" = "true" ]; then
+    exec /ide/node/bin/gitpod-node --inspect ./out/gitpod.js "$@" --verbose --log=trace
+else
+    exec /ide/node/bin/gitpod-node ./out/gitpod.js "$@"
+fi