diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md
index 0b655c283..b2506f5f9 100755
--- a/.chglog/CHANGELOG.tpl.md
+++ b/.chglog/CHANGELOG.tpl.md
@@ -1,20 +1,6 @@
-{{ if .Versions -}}
-<a name="unreleased"></a>
-## [Unreleased]
-
-{{ if .Unreleased.CommitGroups -}}
-{{ range .Unreleased.CommitGroups -}}
-### {{ .Title }}
-{{ range .Commits -}}
-- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
-{{ end }}
-{{ end -}}
-{{ end -}}
-{{ end -}}
-
 {{ range .Versions }}
 <a name="{{ .Tag.Name }}"></a>
-## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
+# {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
 {{ range .CommitGroups -}}
 ### {{ .Title }}
 {{ range .Commits -}}
@@ -22,6 +8,8 @@
 {{ end }}
 {{ end -}}
 
+#### Please report any issues here: https://github.com/Azure/aks-engine/issues/new
+
 {{- if .NoteGroups -}}
 {{ range .NoteGroups -}}
 ### {{ .Title }}
@@ -39,4 +27,5 @@
 [{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
 {{ end -}}
 {{ end -}}
-{{ end -}}
\ No newline at end of file
+
+{{ end -}}
diff --git a/.chglog/config.yml b/.chglog/config.yml
index 66d468aa4..8613ff411 100755
--- a/.chglog/config.yml
+++ b/.chglog/config.yml
@@ -4,19 +4,19 @@ info:
   title: CHANGELOG
   repository_url: https://github.com/Azure/aks-engine
 options:
-  commits:
-    # filters:
-    #   Type:
-    #     - feat
-    #     - fix
-    #     - perf
-    #     - refactor
   commit_groups:
-    # title_maps:
-    #   feat: Features
-    #   fix: Bug Fixes
-    #   perf: Performance Improvements
-    #   refactor: Code Refactoring
+    title_maps:
+      build: Build 🏭
+      chore: Maintenance 🔧
+      ci: Continuous Integration 💜
+      docs: Documentation 📘
+      feat: Features 🌈
+      fix: Bug Fixes 🐞
+      perf: Performance Improvements 🚀
+      refactor: Code Refactoring 💎
+      revert: Revert Change ◀️
+      style: Code Style 🎶
+      test: Testing 💚
   header:
     pattern: "^(\\w*)\\:\\s(.*)$"
     pattern_maps:
@@ -24,4 +24,4 @@ options:
       - Subject
   notes:
     keywords:
-      - BREAKING CHANGE
\ No newline at end of file
+      - BREAKING CHANGE