diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1554f94..e7ad2f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,41 +45,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Documentation
 
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
 - Update VISUAL_IDENTITY.md to reflect current design implementation (#30)
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
 - Update documentation to clarify handling of environment variables and default values in DevMagic
-- Update changelog [skip ci]
 - Enhance Copilot instructions with current stack and best practices (#10)
-- Update changelog [skip ci]
-- Update changelog [skip ci]
 - Refine insights on over-engineering in AI suggestions
-- Update changelog [skip ci]
 - Add blog post on the pitfalls of over-engineering with AI suggestions
 - Add blog post on using containerEnv vs remoteEnv for Dev Container setup
 - Save outline for potential blog posts and notes on AI context files
 - Archive the comprehensive refactor plan for DevContainer from script to features
 - Update docs
 - Update installation flow with Mermaid diagram and synchronization notes
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
-- Update changelog [skip ci]
 - Update Copilot instructions with commit message guidelines and changelog automation details
 
 ### Fixed
diff --git a/cliff.toml b/cliff.toml
index ba634a8..33b4450 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -63,8 +63,19 @@ conventional_commits = true
 filter_unconventional = true
 split_commits = false
 
+# Skip tags to preserve manually curated history
+skip_tags = "v0\\.1\\.0|v0\\.2\\.0|v0\\.2\\.1"
+
 # Commit parsers for grouping
 commit_parsers = [
+  # Skip automated changelog update commits to prevent recursive entries
+  { message = "(?i)^docs.*(?:update changelog|\\[skip ci\\])", skip = true },
+  # Skip release preparation commits
+  { message = "^chore\\(release\\)", skip = true },
+  # Skip dependency update commits from Dependabot
+  { message = "^chore\\(deps\\)", skip = true },
+  # Skip all CI-related commits
+  { message = "^ci", skip = true },
   { message = "^feat", group = "Added" },
   { message = "^fix", group = "Fixed" },
   { message = "^doc", group = "Documentation" },
@@ -73,10 +84,7 @@ commit_parsers = [
   { message = "^refactor", group = "Changed" },
   { message = "^style", group = "Changed" },
   { message = "^test", group = "Changed" },
-  { message = "^chore\\(release\\)", skip = true },
-  { message = "^chore\\(deps\\)", skip = true },
   { message = "^chore", group = "Changed" },
-  { message = "^ci", skip = true },
   { message = "^build", group = "Changed" },
   { body = ".*security", group = "Security" },
   { message = "^revert", group = "Removed" },