diff --git a/.gitpod.yml b/.gitpod.yml
index 0c96f75886a..250512f0bbd 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -14,6 +14,10 @@ tasks:
       cd /workspace/simpleproj && .ddev/gitpod-setup-ddev.sh
       gp await-port 8080 && sleep 1 && gp preview $(gp url 8080)
 
+vscode:
+  extensions:
+    - golang.go
+
 github:
   prebuilds:
     # enable for the master/default branch (defaults to true)
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7c7d5751dff..b1dd9d3eb53 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -7,10 +7,8 @@
             "request": "launch",
             "mode": "debug",
             "remotePath": "",
-            "port": 2345,
-            "host": "127.0.0.1",
             "program": "${workspaceRoot}/cmd/ddev",
-            "cwd": "$HOME/sites/drupal8",
+            "cwd": "/workspace/simpleproj",
             "env": {"DDEV_DEBUG": true},
             "args": [],
             "showLog": true