diff --git a/README.md b/README.md
index 65e1808..965068d 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ _A tiny library to help versioning management of git python projects_
 
 Because a good developer is a lazy developer and version management in CI/CD can be very time consuming.
 
-Checkout [Latest Documentation](https://chacha.ddns.net/mkdocs-web/chacha/pygitversionhelper/{{branch}}/latest/).
+Checkout [Latest Documentation](https://chacha.ddns.net/mkdocs-web/chacha/{{repository}}/{{branch}}/latest/).
 
 ## Features
     - list tags
@@ -23,7 +23,7 @@ Checkout [Latest Documentation](https://chacha.ddns.net/mkdocs-web/chacha/pygitv
     - get current version (bumped)
     - convert / switch from SemVer to PEP440 (both ways)
     - automatic version format detection (SemVer by default)
-    - Get commit message history
+    - get commit message history
 
 ## Options
     - restrict to same branch
diff --git a/pyproject.toml b/pyproject.toml
index 900012f..eb2d6d5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@
 # work.  If not, see <https://creativecommons.org/licenses/by-nc-sa/4.0/>.
 
 [build-system]
-requires = ["setuptools>=63", "wheel", "setuptools_scm"]
+requires = ["setuptools>=63", "wheel", "setuptools_scm","hatchling", "hatch-fancy-pypi-readme"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
@@ -16,7 +16,6 @@ version_scheme= "post-release"
 [project]
 name = "pygitversionhelper"
 description = "pygitversionhelper"
-readme = "README.md"
 requires-python = ">=3.9"
 keywords = ["chacha","chacha","template","pygitversionhelper"]
 license = { file = "LICENSE.md" }
@@ -36,7 +35,21 @@ dependencies = [
     'importlib-metadata; python_version<"3.9"',
     'packaging'
 ]
-dynamic = ["version"]
+dynamic = ["version","readme"]
+
+[tool.hatch.metadata.hooks.fancy-pypi-readme]
+content-type = "text/markdown"
+
+[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
+path = "README.md"
+
+[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]]
+pattern = "{{repository}}"
+replacement = "pygitversionhelper"
+
+[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]]
+pattern = "{{branch}}"
+replacement = "master"
 
 [tool.setuptools]
 platforms = ["any"]