diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index b88993b..a84eb92 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,16 +8,18 @@
   ],
   "customizations": {
     "vscode": {
+      "extensions": [
+        "p2l2.vhdl-by-hgb",
+        "eamodio.gitlens"
+      ],
       "settings": {
         "terminal.integrated.defaultProfile.linux": "bash"
       }
     }
   },
   "remoteUser": "xilinx",
-  "mounts": [
-    "source=${localWorkspaceFolder},target=/workspaces/project,type=bind"
-  ],
-  "workspaceFolder": "/workspaces/project",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/workspaces/${localWorkspaceFolderBasename},type=bind",
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
   "features": {},
   "forwardPorts": [10000]
 }