diff --git a/CHANGELOG.md b/CHANGELOG.md
index 645b33e..1f8a64f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,58 +1,29 @@
-# Changelog for action-molecule-avd
-
-## v1.7
-
-- Fix: Docker stable file & context by @carlbuchmann in https://github.com/arista-netdevops-community/action-molecule-avd/pull/21
-- Bump: Python base image and Molecule 6.x by @ClausHolbechArista in https://github.com/arista-netdevops-community/action-molecule-avd/pull/22
-
-## v1.6
-
-- Fix: Catch git error and consider /github/workspace as safe by @gmuloc in https://github.com/arista-netdevops-community/action-molecule-avd/pull/15
-
-## v1.5
-
-- Bump: Update docker by @carlbuchmann in https://github.com/arista-netdevops-community/action-molecule-avd/pull/13
-
-## v1.4
-
-### Bug fixes
-
-- Fix: Fail on all error codes by @carlbuchmann in https://github.com/arista-netdevops-community/action-molecule-avd/pull/12
-
-## v1.3
+## master
 
 ### Features
 
-- Update to python3.8 and add galaxy_file argument ([#7](https://github.com/arista-netdevops-community/action-molecule-avd/issues/7))
+ - [`e9cd321`](https://github.com/aristanetworks/ansible-avd/commit/e9cd321) [Feat]       Update to python3.8 and add galaxy_file argument ([#7](https://github.com/aristanetworks/ansible-avd/issues/7))
 
 ### Bug fixes
 
-- Restore proper spacing in action.yml ([#9](https://github.com/arista-netdevops-community/action-molecule-avd/issues/9))
-- Update entrypoint shell to support regex match ([#6](https://github.com/arista-netdevops-community/action-molecule-avd/issues/6))
+ - [`4b7651c`](https://github.com/aristanetworks/ansible-avd/commit/4b7651c) [Fix]        Catch git error and consider /github/workspace as safe ([#15](https://github.com/aristanetworks/ansible-avd/issues/15))
+ - [`4e1b998`](https://github.com/aristanetworks/ansible-avd/commit/4e1b998) [Fix]        Catch git error and consider /github/workspace as safe - 2 ([#18](https://github.com/aristanetworks/ansible-avd/issues/18))
+ - [`c1db4fb`](https://github.com/aristanetworks/ansible-avd/commit/c1db4fb) [Fix]        Docker build workflow credentials variable ([#17](https://github.com/aristanetworks/ansible-avd/issues/17))
+ - [`9bc9b19`](https://github.com/aristanetworks/ansible-avd/commit/9bc9b19) [Fix]        Docker stable file & context ([#21](https://github.com/aristanetworks/ansible-avd/issues/21))
+ - [`b3d1d5e`](https://github.com/aristanetworks/ansible-avd/commit/b3d1d5e) [Fix]        Restore proper spacing in action.yml ([#9](https://github.com/aristanetworks/ansible-avd/issues/9))
+ - [`9911181`](https://github.com/aristanetworks/ansible-avd/commit/9911181) [entrypoint] Update entrypoint shell to support regex match ([#6](https://github.com/aristanetworks/ansible-avd/issues/6))
 
 ### Documentation
 
-- Update README with galaxy_file knob ([#10](https://github.com/arista-netdevops-community/action-molecule-avd/issues/10))
+ - [`4637860`](https://github.com/aristanetworks/ansible-avd/commit/4637860) [Doc]        Update README with galaxy_file knob ([#10](https://github.com/aristanetworks/ansible-avd/issues/10))
 
 ### Other changes
 
-- Build system: Add changelog builder
-- Build system: Build docker image with GH actions
-- Build system: Update build context
-- Build system: Update docker tag builder
-- Build system: Add PR linter for conventional commits ([#8](https://github.com/arista-netdevops-community/action-molecule-avd/issues/8))
-
-## v1.2
-
-### Bug fixes
-
-- Update entrypoint shell to support regex match ([#6](https://github.com/arista-netdevops-community/action-molecule-avd/issues/6))
-
-## v1.1
-
-- Add option to select version of Ansible outside of requirements
-- Add test to validate Ansible is installed
-
-## v1.0
+ - [`95740bb`](https://github.com/aristanetworks/ansible-avd/commit/95740bb)              CI: Workaround for bug ([#19](https://github.com/aristanetworks/ansible-avd/issues/19))
+ - [`10847fd`](https://github.com/aristanetworks/ansible-avd/commit/10847fd) [Make]       Build system: Add changelog builder
+ - [`278f483`](https://github.com/aristanetworks/ansible-avd/commit/278f483) [Make]       Build system: Build docker image with GH actions
+ - [`b43cbf4`](https://github.com/aristanetworks/ansible-avd/commit/b43cbf4) [Make]       Build system: Update build context
+ - [`cfcc6e3`](https://github.com/aristanetworks/ansible-avd/commit/cfcc6e3) [Make]       Build system: Update docker tag builder
+ - [`a136522`](https://github.com/aristanetworks/ansible-avd/commit/a136522) [Refactor]   Code Refactoring: Move ansible-compt to docker file ([#20](https://github.com/aristanetworks/ansible-avd/issues/20))
+ - [`c1c3920`](https://github.com/aristanetworks/ansible-avd/commit/c1c3920) [github]     Build system: Add PR linter for conventional commits ([#8](https://github.com/aristanetworks/ansible-avd/issues/8))
 
-- Initial Release