diff --git a/README.md b/README.md
index 7b80e9440..b18652a77 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ docker-compose up -d
 docker-compose exec server ./manage.py migrate
 ```
 
-For bigger setups, there is a Helm Chart in the `helm/` directory. This is documented [here](https://beryju.github.io/passbook/installation/kubernetes/)
+For bigger setups, there is a Helm Chart in the `helm/` directory. This is documented [here](https://passbook.beryju.org//installation/kubernetes/)
 
 ## Screenshots
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 09f851025..29c074b3d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,5 +1,5 @@
 site_name: passbook Docs
-site_url: https://beryju.github.io/passbook
+site_url: https://passbook.beryju.org/
 copyright: "Copyright © 2019 - 2020 BeryJu.org"
 
 nav:
diff --git a/passbook/flows/templates/flows/shell.html b/passbook/flows/templates/flows/shell.html
index be6b22724..c581415ca 100644
--- a/passbook/flows/templates/flows/shell.html
+++ b/passbook/flows/templates/flows/shell.html
@@ -57,7 +57,7 @@
             <p></p>
             <ul class="pf-c-list pf-m-inline">
                 <li>
-                    <a href="https://beryju.github.io/passbook/">{% trans 'Documentation' %}</a>
+                    <a href="https://passbook.beryju.org/">{% trans 'Documentation' %}</a>
                 </li>
                 <!-- todo: load config.passbook.footer.links -->
             </ul>