diff --git a/CHANGELOG.md b/CHANGELOG.md
index e33180d..df969f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [v0.1.3](https://code.thetadev.de/ThetaDev/rustypipe/compare/rustypipe/v0.1.2..v0.1.3) - 2024-04-01
+## [v0.1.3](https://code.thetadev.de/ThetaDev/rustypipe/compare/rustypipe/v0.1.2..rustypipe/v0.1.3) - 2024-04-01
 
 ### 🐛 Bug Fixes
 
@@ -12,13 +12,13 @@ All notable changes to this project will be documented in this file.
 
 - "fix: improve VecLogErr messages" (leads to infinite loop) - ([348c852](https://code.thetadev.de/ThetaDev/rustypipe/commit/348c8523fe847f2f6ce98317375a7ab65e778ed2))
 
-## [v0.1.2](https://code.thetadev.de/ThetaDev/rustypipe/compare/rustypipe/v0.1.1..v0.1.2) - 2024-03-26
+## [v0.1.2](https://code.thetadev.de/ThetaDev/rustypipe/compare/rustypipe/v0.1.1..rustypipe/v0.1.2) - 2024-03-26
 
 ### 🐛 Bug Fixes
 
 - Correctly parse subscriber count with new channel header - ([180dd98](https://code.thetadev.de/ThetaDev/rustypipe/commit/180dd9891a14b4da9f130a73d73aecc3822fce2f))
 
-## [v0.1.1](https://code.thetadev.de/ThetaDev/rustypipe/compare/rustypipe-cli/v0.1.0..v0.1.1) - 2024-03-26
+## [v0.1.1](https://code.thetadev.de/ThetaDev/rustypipe/compare/rustypipe/v0.1.0..rustypipe/v0.1.1) - 2024-03-26
 
 ### 🐛 Bug Fixes
 
@@ -28,7 +28,7 @@ All notable changes to this project will be documented in this file.
 
 - Update user agent (FF 115.0) - ([be314d5](https://code.thetadev.de/ThetaDev/rustypipe/commit/be314d57ea1d99bfdc80649351ee3e7845541238))
 
-## v0.1.0 - 2024-03-22
+## [v0.1.0](https://code.thetadev.de/ThetaDev/rustypipe/commits/tag/rustypipe/v0.1.0) - 2024-03-22
 
 Initial release
 
diff --git a/Justfile b/Justfile
index 6a3224a..99126ba 100644
--- a/Justfile
+++ b/Justfile
@@ -69,7 +69,7 @@ release crate="rustypipe":
 
     if git rev-parse "$TAG" >/dev/null 2>&1; then echo "version tag $TAG already exists"; exit 1; fi
 
-    CLIFF_ARGS="--tag 'v${VERSION}' --tag-pattern '${CRATE}/*' --unreleased $INCLUDES"
+    CLIFF_ARGS="--tag '${TAG}' --tag-pattern '${CRATE}/*' --unreleased $INCLUDES"
     echo "git-cliff $CLIFF_ARGS"
     if [ -f "$CHANGELOG" ]; then
         eval "git-cliff $CLIFF_ARGS --prepend '$CHANGELOG'"
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
index bab248d..057a9d8 100644
--- a/cli/CHANGELOG.md
+++ b/cli/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## v0.1.0 - 2024-03-22
+## [v0.1.0](https://code.thetadev.de/ThetaDev/rustypipe/commits/tag/rustypipe-cli/v0.1.0) - 2024-03-22
 
 Initial release
 
diff --git a/cliff.toml b/cliff.toml
index c175f64..066cdd5 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -16,10 +16,11 @@ All notable changes to this project will be documented in this file.\n
 body = """
 {% set repo_url = "https://code.thetadev.de/ThetaDev/rustypipe" %}\
 {% if version %}\
+    {%set vname = version | split(pat="/") | last %}
     {%if previous.version %}\
-        ## [{{ version }}]({{ repo_url }}/compare/{{ previous.version }}..{{ version }})\
+        ## [{{ vname }}]({{ repo_url }}/compare/{{ previous.version }}..{{ version }})\
     {% else %}\
-        ## {{ version }}\
+        ## [{{ vname }}]({{ repo_url }}/commits/tag/{{ version }})\
     {% endif %} - {{ timestamp | date(format="%Y-%m-%d") }}
 {% else %}\
     ## [unreleased]
diff --git a/downloader/CHANGELOG.md b/downloader/CHANGELOG.md
index bab248d..f5ac11c 100644
--- a/downloader/CHANGELOG.md
+++ b/downloader/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## v0.1.0 - 2024-03-22
+## [v0.1.0](https://code.thetadev.de/ThetaDev/rustypipe/commits/tag/rustypipe-downloader/v0.1.0) - 2024-03-22
 
 Initial release