diff --git a/.chglog/CHANGELOG-LINK.tpl.md b/.chglog/CHANGELOG-LINK.tpl.md
index 3d07dc1b2..72ff10f88 100755
--- a/.chglog/CHANGELOG-LINK.tpl.md
+++ b/.chglog/CHANGELOG-LINK.tpl.md
@@ -1,11 +1,11 @@
 # CHANGELOG LINK
 This is CHANGELOG after this repository was forked from CosmWasm/cosmwasm.
 {{ range .Versions }}
-## {{ if .Tag.Previous }}{{ .Tag.Name }}{{ else }}{{ .Tag.Name }}{{ end }}
+## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }}
 {{ range .CommitGroups -}}
 ### {{ .Title }}
 {{ range .Commits -}}
-- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} ([{{.Hash.Short}}](https://github.com/line/cosmwasm/commit/{{.Hash.Short}}))
 {{ end }}
 {{ end -}}
 {{- if .NoteGroups -}}
@@ -16,4 +16,4 @@ This is CHANGELOG after this repository was forked from CosmWasm/cosmwasm.
 {{ end }}
 {{ end -}}
 {{ end -}}
-{{ end -}}
\ No newline at end of file
+{{ end -}}
diff --git a/.chglog/config.yml b/.chglog/config.yml
index 7a165ccfb..7869037da 100755
--- a/.chglog/config.yml
+++ b/.chglog/config.yml
@@ -4,6 +4,7 @@ info:
   title: CHANGELOG
   repository_url: https://github.com/line/cosmwasm
 options:
+  tag_filter_pattern: '^v\d+\.\d+\.\d+-\d+\.\d+\.\d+'
   commits:
     filters:
       Type:
@@ -18,9 +19,10 @@ options:
       perf: Performance Improvements
       refactor: Code Refactoring
   header:
-    pattern: "^(\\w*)\\:\\s(.*)$"
+    pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$"
     pattern_maps:
       - Type
+      - Scope
       - Subject
   notes:
     keywords:
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 82c4cc250..4ff3c4fb1 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -2,6 +2,7 @@ name: changelog
 
 on:
   pull_request:
+    types: [opened]
 
 jobs:
   changelog:
@@ -30,6 +31,6 @@ jobs:
       - name: Merge CHANGELOG-LINK.md
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: "chore: Update CHANGELOG-LINK.md"
+          commit_message: "docs(changelog): update changelog for v${{ steps.get_version.outputs.VERSION }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}