diff --git a/features/src/claude-code/devcontainer-feature.json b/features/src/claude-code/devcontainer-feature.json
index 168ea5c..a3af855 100644
--- a/features/src/claude-code/devcontainer-feature.json
+++ b/features/src/claude-code/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "claude-code",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "name": "Claude Code",
   "documentationURL": "https://github.com/shokkunrf/develop/tree/main/features/src/claude-code",
   "description": "Installs Claude Code CLI via the official installer",
diff --git a/features/src/claude-code/install.sh b/features/src/claude-code/install.sh
index 68c4913..51fb114 100755
--- a/features/src/claude-code/install.sh
+++ b/features/src/claude-code/install.sh
@@ -24,7 +24,7 @@ _install_claude_code() {
     fi
 
     # Clean up config files generated by the installer to avoid stale state
-    _user_home="${_REMOTE_USER_HOME:-$HOME}"
+    _user_home="${_REMOTE_USER_HOME:-$(getent passwd "${_REMOTE_USER:-root}" | cut -d: -f6)}"
     rm -Rf "$_user_home/.claude" "$_user_home/.claude.json"
 }
 
diff --git a/features/test/claude-code/test.sh b/features/test/claude-code/test.sh
index cd2cd7e..21d21d4 100644
--- a/features/test/claude-code/test.sh
+++ b/features/test/claude-code/test.sh
@@ -6,6 +6,8 @@ set -e
 source dev-container-features-test-lib
 
 # Definition specific tests
+check "no .claude directory" bash -c "[ ! -d ~/.claude ]"
+check "no .claude.json file" bash -c "[ ! -f ~/.claude.json ]"
 check "claude is installed" claude --version
 check "claude is upgradable" claude upgrade