diff --git a/.devcontainer/scripts/onCreateCommand.sh b/.devcontainer/scripts/onCreateCommand.sh
index 1ebf260b..d1681900 100755
--- a/.devcontainer/scripts/onCreateCommand.sh
+++ b/.devcontainer/scripts/onCreateCommand.sh
@@ -15,15 +15,18 @@
 # SPDX-License-Identifier: Apache-2.0
 
 sudo chmod +x .devcontainer/scripts/*.sh
-sudo chown -R $(whoami) $HOME
 
 .devcontainer/scripts/setup-git.sh
 
 if [[ -z "${VELOCITAS_OFFLINE}" ]]; then
     .devcontainer/scripts/configure-codespaces.sh
     .devcontainer/scripts/upgrade-cli.sh
-elif [[ -x .devcontainer/scripts/local-setup.sh ]]; then
-    .devcontainer/scripts/local-setup.sh
+fi
+
+# Call user initialization hook if present
+ON_CREATE_USER_HOOK_PATH=.devcontainer/scripts/onCreateUserHook.sh
+if [[ -x $ON_CREATE_USER_HOOK_PATH ]]; then
+    $ON_CREATE_USER_HOOK_PATH
 fi
 
 echo "#######################################################"
diff --git a/.devcontainer/scripts/postStartCommand.sh b/.devcontainer/scripts/postStartCommand.sh
index e9ad48a1..7481d2a0 100755
--- a/.devcontainer/scripts/postStartCommand.sh
+++ b/.devcontainer/scripts/postStartCommand.sh
@@ -15,3 +15,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 .devcontainer/scripts/upgrade-cli.sh
+
+# Call user initialization hook if present
+POST_START_USER_HOOK_PATH=.devcontainer/scripts/onPostStartUserHook.sh
+if [[ -x $POST_START_USER_HOOK_PATH ]]; then
+    $POST_START_USER_HOOK_PATH
+fi
diff --git a/.velocitas-lock.json b/.velocitas-lock.json
index bcbb3465..3816d1d9 100644
--- a/.velocitas-lock.json
+++ b/.velocitas-lock.json
@@ -3,6 +3,6 @@
         "devenv-runtimes": "v4.0.6",
         "devenv-github-workflows": "v6.1.3",
         "devenv-github-templates": "v1.0.5",
-        "devenv-devcontainer-setup": "v2.5.1"
+        "devenv-devcontainer-setup": "v2.5.2"
     }
 }
diff --git a/.velocitas.json b/.velocitas.json
index de0c1e1b..c598f71e 100644
--- a/.velocitas.json
+++ b/.velocitas.json
@@ -3,7 +3,7 @@
         "devenv-runtimes": "v4.0.6",
         "devenv-github-workflows": "v6.1.3",
         "devenv-github-templates": "v1.0.5",
-        "devenv-devcontainer-setup": "v2.5.1"
+        "devenv-devcontainer-setup": "v2.5.2"
     },
     "components": [
         "runtime-local",