diff --git a/.github/chglog/changelog.yml b/.github/chglog/changelog.yml
index 9ba3d0eb..a1aa166b 100755
--- a/.github/chglog/changelog.yml
+++ b/.github/chglog/changelog.yml
@@ -1,17 +1,25 @@
+---
 style: github
 template: CHANGELOG.tpl.md
 info:
   title: CHANGELOG
   repository_url: https://github.com/starship/starship
 options:
-  commits:
-    # filters:
-    #   Type:
-    #     - feat
-    #     - fix
-    #     - perf
-    #     - refactor
+  commits: {}
   commit_groups:
+    sort_by: Custom
+    title_order:
+      - feat
+      - fix
+      - docs
+      - style
+      - refactor
+      - perf
+      - test
+      - build
+      - ci
+      - chore
+      - revert
     title_maps:
       feat: Features
       fix: Bug Fixes
diff --git a/.github/chglog/release.yml b/.github/chglog/release.yml
index 0b7398a6..a508ba8c 100755
--- a/.github/chglog/release.yml
+++ b/.github/chglog/release.yml
@@ -1,15 +1,10 @@
+---
 style: github
 template: RELEASE.tpl.md
 info:
   repository_url: https://github.com/starship/starship
 options:
-  commits:
-    # filters:
-    #   Type:
-    #     - feat
-    #     - fix
-    #     - perf
-    #     - refactor
+  commits: {}
   commit_groups:
     sort_by: Custom
     title_order:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2d874bfb..605ff77d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -126,7 +126,7 @@ jobs:
       - name: Setup | Go
         uses: actions/setup-go@v2
         with:
-          go-version: "^1.15.7"
+          go-version: "1.16"
 
       - name: Setup | Artifacts
         uses: actions/download-artifact@v2
@@ -136,7 +136,7 @@ jobs:
 
       - name: Setup | Release notes
         run: |
-          GO111MODULE=on go get github.com/git-chglog/git-chglog/cmd/git-chglog@0.9.1
+          go install github.com/git-chglog/git-chglog/cmd/git-chglog@v0.15.0
           git-chglog -c .github/chglog/release.yml $(git describe --tags) > RELEASE.md
 
       - name: Build | Publish