diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6b08e29..a9cc4a0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,11 +29,13 @@ jobs:
                   badge-threshold-green: 90
                   badge-threshold-orange: 80
             - name: Generate Changelog
-              run: git log --oneline $(git describe --tags --abbrev=0)..HEAD >> CHANGELOG.txt
               if: ${{ startsWith(github.ref, 'refs/tags/') }}
-            - name: Release
+              run: |
+                  echo "# What's new ?" > CHANGELOG.md
+                  git log --pretty='- %h %s by %aN' --no-merges $(git describe --tags --abbrev=0 @^)..@ >> CHANGELOG.md
+            - name: Pre Release
               uses: softprops/action-gh-release@v1
               if: ${{ startsWith(github.ref, 'refs/tags/') }}
               with:
-                  body_path: CHANGELOG.txt
+                  body_path: CHANGELOG.md
                   draft: true
diff --git a/.gitignore b/.gitignore
index 641f36c..557888e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ index.html
 build
 node_modules
 .parcel-cache
-coverage
\ No newline at end of file
+coverage
+CHANGELOG.md
\ No newline at end of file
diff --git a/README.md b/README.md
index 4cc0079..5347487 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # MJML Bar Chart
-[![main](https://github.com/Freezystem/mjml-bar-chart/actions/workflows/test.yml/badge.svg?style=flat)](https://github.com/Freezystem/mjml-bar-chart/actions/workflows/test.yml?query=branch%3Amain)
-![example workflow](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/wiki/Freezystem/mjml-bar-chart/coverage-diff-badge.json&logo=jest)
+[![Workflow](https://img.shields.io/github/actions/workflow/status/Freezystem/mjml-bar-chart/test.yml?logo=github)](https://github.com/Freezystem/mjml-bar-chart/actions/workflows/test.yml?query=branch%3Amain)
+![Coverage](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/wiki/Freezystem/mjml-bar-chart/coverage-diff-badge.json&logo=jest)
 
 ## Getting started