diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 36c87bc..03b2fe3 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.6",
+    "version": "2.0.7",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index ff2c54c..893f53a 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -383,6 +383,10 @@ if [ "${USERNAME}" = "root" ]; then
     user_rc_path="/root"
 else
     user_rc_path="/home/${USERNAME}"
+    if [ ! -d "${user_rc_path}" ]; then
+        mkdir -p "${user_rc_path}"
+        chown ${USERNAME}:${group_name} "${user_rc_path}"
+    fi
 fi
 
 # Restore user .bashrc / .profile / .zshrc defaults from skeleton file if it doesn't exist or is empty