diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md
index 95a8415..3f7457d 100755
--- a/.chglog/CHANGELOG.tpl.md
+++ b/.chglog/CHANGELOG.tpl.md
@@ -6,10 +6,14 @@
 {{ range .CommitGroups -}}
 ### {{ .Title }}
 
+{{ $subjects := list }}
 {{ range .Commits -}}
+{{ if not (has .Subject $subjects) -}}
 - {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ $subjects = append $subjects .Subject -}}
 {{ end }}
-{{ end -}}
+{{- end }}
+{{- end -}}
 
 {{- if .NoteGroups -}}
 {{ range .NoteGroups -}}
diff --git a/.drone.yml b/.drone.yml
index aebb7f4..b1e9deb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -57,15 +57,22 @@ steps:
   depends_on:
   - dryrun
 
-- name: changelog
+- name: changelog-generate
   image: thegeeklab/git-chglog
   commands:
   - git fetch -tq
-  - git-chglog --no-color --no-emoji ${DRONE_TAG:---next-tag unreleased unreleased}
   - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
   depends_on:
   - tags
 
+- name: changelog-format
+  image: thegeeklab/alpine-tools
+  commands:
+  - prettier CHANGELOG.md
+  - prettier -w CHANGELOG.md
+  depends_on:
+  - changelog-generate
+
 - name: publish-dockerhub
   image: thegeeklab/drone-docker-buildx:20
   settings:
@@ -194,6 +201,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 1dc2d3a35a7202ce60e22c88d41a03be79f0f8f85ecff965edefa68ed9801757
+hmac: bca81112c000d6b5f1434f6dea69b7dcb3d34aa38ffc439c42db6e1d369276de
 
 ...
diff --git a/.prettierignore b/.prettierignore
index eef18b7..97e0b3e 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1 +1,2 @@
 .drone.yml
+*.tpl.md