diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..b071a06
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,56 @@
+# Claude Assistant Guidelines
+
+This document contains guidelines for Claude when working on this project.
+
+## Git Workflow
+
+### Commits and Pushes
+
+**IMPORTANT: Never commit or push without explicit user approval.**
+
+When changes are ready to be committed:
+1. Make the code changes
+2. Show the user what will be committed (git status/diff)
+3. **Wait for explicit approval** from the user before running `git commit` and `git push`
+4. Only proceed with commits when the user says "commit and push" or similar
+
+### Commit Message Format
+
+Use the following format for commit messages:
+
+```
+<Short description of changes>
+
+<Optional longer description with bullet points>
+- Detail 1
+- Detail 2
+
+Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
+```
+
+## Project Structure
+
+This is a monorepo containing:
+- **haos-integration**: Home Assistant custom integration (submodule)
+- **media-server**: FastAPI media server (submodule)
+
+### Submodule Workflow
+
+When making changes:
+1. Commit changes in the submodule first
+2. Push the submodule
+3. Update the main repo to reference the new submodule commit
+4. Commit and push the main repo
+
+## Code Style
+
+- Follow existing code patterns
+- Add comprehensive documentation for new features
+- Update README files when adding new functionality
+- Include examples in documentation
+
+## Testing
+
+- Test changes locally before committing
+- Verify server restarts successfully after changes
+- Check integration compatibility with Home Assistant
diff --git a/haos-integration b/haos-integration
index 959c6a4..e4eeb2a 160000
--- a/haos-integration
+++ b/haos-integration
@@ -1 +1 @@
-Subproject commit 959c6a4eda4757bcf25498a9a74265c47237e858
+Subproject commit e4eeb2a97b7e1a80cbade175214cc26a0cde59e8
diff --git a/media-server b/media-server
index 71a0a6e..d7c5994 160000
--- a/media-server
+++ b/media-server
@@ -1 +1 @@
-Subproject commit 71a0a6e6d14a9e6899b9d78ce9985afd9362fa7c
+Subproject commit d7c5994e568524024d3df34bc3a36911d9c46c96