diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d3ef2f2..90e89ed 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
 	"name": "Node.js & PostgreSQL",
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "app",
-	"workspaceFolder": "/workspace",
+	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
 	// Configure tool-specific properties.
 	"customizations": {
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index a34fdf5..55d195f 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -12,7 +12,7 @@ services:
         VARIANT: 16-bullseye
 
     volumes:
-      - ..:/workspace:cached
+      - ../..:/workspaces:cached
       
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity