diff --git a/.agent/rules/bos55-nix-style.md b/.agent/rules/bos55-nix-style.md
index a270be0..9ea05b3 100644
--- a/.agent/rules/bos55-nix-style.md
+++ b/.agent/rules/bos55-nix-style.md
@@ -33,5 +33,7 @@ Follow these rules when modifying or extending the Bos55 NixOS configuration.
 ## 6. CI/CD Robustness
 - **IP-Based Login**: When CI runners (Gitea Actions) need to interact with internal services, use direct IP addresses (e.g., `192.168.0.25`) for login/auth to bypass potential DNS resolution issues in the runner environment.
 
-## 7. No Magic Values
-- **Shared Variables**: If a port or string is used in multiple places within a module (e.g., for the service listener and the DB connection string), use a variable or option to ensure they always stay in sync.
+## 8. Git Workflow & Commits
+- **Atomic Commits**: Each commit should represent a single logical change and be easily revertible. Split docs, metadata, and core code changes into separate commits.
+- **Conventional Commits**: Use conventional commit messages (e.g., `feat:`, `fix:`, `docs:`, `refactor:`, `ci:`, `meta:`).
+- **Branching**: Always work in feature branches and push to origin to create pull requests.
diff --git a/.agent/skills/bos55-nix-config/SKILL.md b/.agent/skills/bos55-nix-config/SKILL.md
index 9e9ada9..cf364dd 100644
--- a/.agent/skills/bos55-nix-config/SKILL.md
+++ b/.agent/skills/bos55-nix-config/SKILL.md
@@ -45,3 +45,7 @@ This skill provides the core principles and implementation patterns for the Bos5
 - **Supply Chain Protection**: Always verify and lock Nix flake inputs. Use fixed-output derivations for external resource downloads.
 - **Assumptions Documentation**: Clearly document environment assumptions (e.g., Proxmox virtualization, Tailscale networking, and specific IP ranges) in host or service READMEs.
 - **Project Structure**: Maintain the separation of `hosts`, `modules`, `users`, and `secrets` to ensure clear ownership and security boundaries.
+
+### 5. Git Standards
+- **Rule**: Follow **Conventional Commits** (e.g., `feat:`, `refactor:`, `docs:`, `meta:`).
+- **Rule**: Keep commits **atomic** and **revertible**. Never mix documentation, infrastructure, and style guide changes in a single commit.