diff --git a/.chglog/config.yml b/.chglog/config.yml
index 285f9de..de38198 100755
--- a/.chglog/config.yml
+++ b/.chglog/config.yml
@@ -11,6 +11,9 @@ options:
       perf: Performance Improvements
       refactor: Code Refactoring
       chore: Others
+      test: Testing
+      ci: CI Pipeline
+      docs: Documentation
   header:
     pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$"
     pattern_maps:
diff --git a/.drone.yml b/.drone.yml
index be53e59..adc8c9d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -107,6 +107,15 @@ steps:
   commands:
   - cd dist/ && sha256sum * > ../sha256sum.txt
 
+- name: changelog
+  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: release
   image: plugins/github-release
   settings:
@@ -118,10 +127,15 @@ steps:
     note: CHANGELOG.md
     overwrite: true
     title: ${DRONE_TAG}
+  when:
+    ref:
+    - refs/tags/**
 
 trigger:
   ref:
+  - refs/heads/master
   - refs/tags/**
+  - refs/pull/**
 
 depends_on:
 - test
@@ -240,6 +254,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 5a9fb43eef9e2acf0b02e3a401dfac450cf498acdcb48b6dbf81ee0db5751f8d
+hmac: ce4008cf5e93c162f4ac2da3ad04ba6bf19fa4e9f067443f60a02efed2250b6e
 
 ...
diff --git a/.gitignore b/.gitignore
index 00675f9..86db449 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ node_modules/
 lhci_reports/
 exampleSite/themes/
 exampleSite/public/
+CHANGELOG.md
 
 # auto-generated files
 layouts/partials/icons-svg-symbols.html
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 3a824e8..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Changelog
-
-## [v0.8.5](https://github.com/thegeeklab/hugo-geekdoc/compare/v0.8.4...v0.8.5) (2021-02-07)
-
-### Bug Fixes
-
-- set line-height in normalized h1 to avoid overlapping ([#58](https://github.com/thegeeklab/hugo-geekdoc/issues/58))
-
-### Others
-
-- set a proper value for lighthouse throttling ([#59](https://github.com/thegeeklab/hugo-geekdoc/issues/59))
-