diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 79c36de..f420159 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -12,5 +12,6 @@
     }
   },
   "dockerComposeFile": "./../compose.yaml",
-  "service": "shell"
+  "service": "shell",
+  "workspaceFolder": "/workspaces/pskel"
 }
diff --git a/.devcontainer/local/devcontainer.json b/.devcontainer/local/devcontainer.json
index 967b7cf..fdaeab8 100644
--- a/.devcontainer/local/devcontainer.json
+++ b/.devcontainer/local/devcontainer.json
@@ -17,8 +17,8 @@
     {
       "type": "bind",
       "source": "./",
-      "target": "/workspace/pskel"
+      "target": "/workspaces/pskel"
     }
   ],
-  "workspaceFolder": "/workspace/pskel"
+  "workspaceFolder": "/workspaces/pskel"
 }
diff --git a/pskel.sh b/pskel.sh
index 40b9b1b..ce34ee7 100755
--- a/pskel.sh
+++ b/pskel.sh
@@ -21,9 +21,9 @@ EOF
 
   PSKEL_EXT_DIR="/ext"
 
-  if test -d "/workspace/pskel/ext"; then
-    echo "[Pskel] Development containers workspace detected, use \"/workspace/pskel/ext\"." >&2
-    PSKEL_EXT_DIR="/workspace/pskel/ext"
+  if test -d "/workspaces/pskel/ext"; then
+    echo "[Pskel] Development containers workspace detected, use \"/workspaces/pskel/ext\"." >&2
+    PSKEL_EXT_DIR="/workspaces/pskel/ext"
   fi
 
   /usr/local/bin/php "/usr/src/php/ext/ext_skel.php" --ext "${1}" --dir "/tmp" ${@}
@@ -90,9 +90,9 @@ EOF
 
   PSKEL_EXT_DIR="/ext"
 
-  if test -d "/workspace/pskel/ext"; then
-    echo "[Pskel] Development containers workspace detected, use \"/workspace/pskel/ext\"." >&2
-    PSKEL_EXT_DIR="/workspace/pskel/ext"
+  if test -d "/workspaces/pskel/ext"; then
+    echo "[Pskel] Development containers workspace detected, use \"/workspaces/pskel/ext\"." >&2
+    PSKEL_EXT_DIR="/workspaces/pskel/ext"
   else
     if test -f "/ext/.gitkeep" && test $(cat "/ext/.gitkeep") = "pskel_uninitialized"; then
        echo "[Pskel] Uninitialized project detected, initialize default skeleton." >&2