diff --git a/.ddev/addon-metadata/claude-code/manifest.yaml b/.ddev/addon-metadata/claude-code/manifest.yaml
deleted file mode 100644
index 332e9c3..0000000
--- a/.ddev/addon-metadata/claude-code/manifest.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: claude-code
-repository: /Users/fromme/Development/Misc/ddev-claude-code
-version: ""
-install_date: "2026-01-07T09:27:36+01:00"
-project_files:
-    - web-build/Dockerfile.claude-code
-    - commands/web/claude
-    - config.claude-code.yaml
-    - claude-code/.claude.json
-    - claude-code/.gitignore
-global_files: []
-removal_actions: []
diff --git a/.ddev/addon-metadata/claude/manifest.yaml b/.ddev/addon-metadata/claude/manifest.yaml
new file mode 100644
index 0000000..bb05849
--- /dev/null
+++ b/.ddev/addon-metadata/claude/manifest.yaml
@@ -0,0 +1,9 @@
+name: claude
+repository: /Users/fromme/Development/Misc/ddev-claude-code
+version: ""
+install_date: "2026-01-09T16:22:30+01:00"
+project_files:
+    - commands/web/claude
+    - config.claude.yaml
+global_files: []
+removal_actions: []
diff --git a/.ddev/claude-code/.gitignore b/.ddev/claude-code/.gitignore
deleted file mode 100644
index 1aa6766..0000000
--- a/.ddev/claude-code/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-#ddev-generated
-# Claude Code internal config
-.claude.json
-.claude/
diff --git a/.ddev/commands/web/claude b/.ddev/commands/web/claude
index 828b55e..9516cf8 100755
--- a/.ddev/commands/web/claude
+++ b/.ddev/commands/web/claude
@@ -1,10 +1,19 @@
-#ddev-generated
 #!/bin/bash
 
-## Description: Claude Code!
-## Usage: claude
-## Example: ddev claude [...]
+## Description: Run Claude Code
+## Usage: claude [args]
+## Example: ddev claude
+## Example: ddev claude --help
+## Example: ddev claude doctor
 
-set -e
+# Ensure ~/.local/bin is in PATH
+export PATH="$HOME/.local/bin:$PATH"
 
-claude $@
\ No newline at end of file
+# Check if claude is installed
+if [ ! -f "$HOME/.local/bin/claude" ]; then
+  echo "Claude Code is not installed. Installing now..."
+  curl -fsSL https://claude.ai/install.sh | bash
+fi
+
+# Run claude with all arguments
+exec "$HOME/.local/bin/claude" "$@"
diff --git a/.ddev/config.claude-code.yaml b/.ddev/config.claude-code.yaml
deleted file mode 100644
index bde9814..0000000
--- a/.ddev/config.claude-code.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-#ddev-generated
-hooks:
-  post-start:
-    - exec: ">> /var/www/html/.ddev/claude-code/.claude.json && ln -s /var/www/html/.ddev/claude-code/.claude.json ~/.claude.json"
-    - exec: "mkdir -p /var/www/html/.ddev/claude-code/.claude && ln -s /var/www/html/.ddev/claude-code/.claude ~/.claude"
-
-webimage_extra_packages:
-  - xdg-utils
-
diff --git a/.ddev/config.claude.yaml b/.ddev/config.claude.yaml
new file mode 100644
index 0000000..22ceea3
--- /dev/null
+++ b/.ddev/config.claude.yaml
@@ -0,0 +1,6 @@
+# Claude Code add-on configuration
+# This file is merged with your project's .ddev/config.yaml
+
+hooks:
+  post-start:
+    - exec: "mkdir -p ~/.bashrc.d && test -f ~/.bashrc.d/claude.sh || echo 'export PATH=\"$HOME/.local/bin:$PATH\"' > ~/.bashrc.d/claude.sh && test -f ~/.local/bin/claude || curl -fsSL https://claude.ai/install.sh | bash"
diff --git a/.ddev/web-build/Dockerfile.claude-code b/.ddev/web-build/Dockerfile.claude-code
deleted file mode 100644
index 59d0f38..0000000
--- a/.ddev/web-build/Dockerfile.claude-code
+++ /dev/null
@@ -1,3 +0,0 @@
-#ddev-generated
-
-RUN npm install -g @anthropic-ai/claude-code