diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 36cb7076d88..d6d54269f8e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
     "../docker-compose-light.yml"
   ],
   "service": "superset-node-light",
-  "workspaceFolder": "/app",
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
   // Use the light config for faster startup and lower resource usage
   "shutdownAction": "stopCompose",
@@ -71,10 +71,10 @@
   },
 
   // Run commands after container is created
-  "postCreateCommand": "chmod +x /app/.devcontainer/start-superset.sh && echo '🚀 Superset Codespace ready! Run: .devcontainer/start-superset.sh to start'",
+  "postCreateCommand": "chmod +x .devcontainer/start-superset.sh && echo '🚀 Superset Codespace ready! Run: .devcontainer/start-superset.sh to start'",
 
   // Auto-start Superset on Codespace resume
-  "postStartCommand": "cd /app && .devcontainer/start-superset.sh",
+  "postStartCommand": ".devcontainer/start-superset.sh",
 
   // Features to add to the dev container
   "features": {
diff --git a/.devcontainer/start-superset.sh b/.devcontainer/start-superset.sh
index 3fe5735313b..14930ae3bbc 100755
--- a/.devcontainer/start-superset.sh
+++ b/.devcontainer/start-superset.sh
@@ -8,7 +8,7 @@ echo "📦 Using project name: ${CODESPACE_NAME}"
 echo "🌐 Frontend will be available at port 9001"
 
 # Ensure we're in the right directory
-cd /workspaces/superset-2 || cd /app
+cd /workspaces/superset-2 || cd /workspaces/superset || cd .
 
 # Check if docker is running
 if ! docker info > /dev/null 2>&1; then