diff --git a/CLAUDE.md b/CLAUDE.md
index 465cb9e..61141ec 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -54,6 +54,12 @@ nix develop
 
 Secrets are handled by sops. Do not edit any `.sops.yaml` or any file within `secrets/`. Ask the user to modify if necessary.
 
+### Git Workflow
+
+**Important:** Never commit directly to `master` unless the user explicitly asks for it. Always create a feature branch for changes.
+
+When starting a new plan or task, the first step should typically be to create and checkout a new branch with an appropriate name (e.g., `git checkout -b dns-automation` or `git checkout -b fix-nginx-config`).
+
 ### Git Commit Messages
 
 Commit messages should follow the format: `topic: short description`