diff --git a/README.md b/README.md
index b694e1223fb05f577ce6a6cc4a46f69a7230464d..9d99998a10746a60744820b116706a3a81f52cae 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # ZIH HPC Documentation
 
 This repository contains the documentation of the HPC systems and services provided at
-https://doc.zih.tu-dresden.de/ by [TU Dresden/ZIH](https://tu-dresden.de/zih/).
+https://compendium.hpc.tu-dresden.de/ by [TU Dresden/ZIH](https://tu-dresden.de/zih/).
 
 ## Setup
 
@@ -25,7 +25,7 @@ issues.
 ## Contributing
 
 Contributions from user-side are highly welcome. Please refer to
-[Contribution guide](doc.zih.tu-dresden.de/docs/contrib/howto_contribute.md) to get started.
+[Contribution guide](compendium.hpc.tu-dresden.de/contrib/howto_contribute) to get started.
 
 ## Licenses
 
diff --git a/doc.zih.tu-dresden.de/docs/accessibility.md b/doc.zih.tu-dresden.de/docs/accessibility.md
index ba40340fe0d9995c27b4013d06a01400dc279e87..f316a69a21347148c47181c85422847de6a7dc4a 100644
--- a/doc.zih.tu-dresden.de/docs/accessibility.md
+++ b/doc.zih.tu-dresden.de/docs/accessibility.md
@@ -1,7 +1,9 @@
 # Erklärung zur Barrierefreiheit
 
 Diese Erklärung zur Barrierefreiheit gilt für die unter
-[https://doc.zih.tu-dresden.de](https://doc.zih.tu-dresden.de) und
+[https://doc.zih.tu-dresden.de](https://doc.zih.tu-dresden.de),
+[https://doc.hpc.tu-dresden.de](https://doc.hpc.tu-dresden.de),
+[https://compendium.hpc.tu-dresden.de](https://compendium.hpc.tu-dresden.de) und
 [https://hpc-wiki.zih.tu-dresden.de](https://hpc-wiki.zih.tu-dresden.de) veröffentlichte Website
 der Technischen Universität Dresden.
 Als öffentliche Stelle im Sinne des Barrierefreie-Websites-Gesetz (BfWebG) ist die Technische
@@ -32,11 +34,11 @@ wenden (Koordinatorin: Mandy Weickert, E-Mail: <barrieren@tu-dresden.de>, Telefo
 Wenn wir Ihre Rückmeldungen aus Ihrer Sicht nicht befriedigend bearbeiten, können Sie sich an die
 Sächsische Durchsetzungsstelle wenden:
 
-Beauftragter der Sächsischen Staatsregierung für die Belange von Menschen mit Behinderungen  
-Albertstraße 10  
-01097 Dresden  
-Postanschrift: Archivstraße 1, 01097 Dresden  
-E-Mail: <info.behindertenbeauftragter@sk.sachsen.de>  
-Telefon: +49 351 564-12161  
-Fax: +49 351 564-12169  
+Beauftragter der Sächsischen Staatsregierung für die Belange von Menschen mit Behinderungen
+Albertstraße 10
+01097 Dresden
+Postanschrift: Archivstraße 1, 01097 Dresden
+E-Mail: <info.behindertenbeauftragter@sk.sachsen.de>
+Telefon: +49 351 564-12161
+Fax: +49 351 564-12169
 Webseite: [https://www.inklusion.sachsen.de/](https://www.inklusion.sachsen.de/)
diff --git a/doc.zih.tu-dresden.de/docs/application/project_request_form.md b/doc.zih.tu-dresden.de/docs/application/project_request_form.md
index d4c51b5765526eb70fe94367b7eafb6b9b1fe11a..2eca87c72093b405362652c5d1276fc6099f21ca 100644
--- a/doc.zih.tu-dresden.de/docs/application/project_request_form.md
+++ b/doc.zih.tu-dresden.de/docs/application/project_request_form.md
@@ -22,7 +22,8 @@ a coordinated consulting service on the methodological competence of scientific
 The aim is to provide scientists at German universities with computing capacity
 for their research and to strengthen their skills in the efficient use of this resource.
 
-Due to the structuring there are different ways to access [HPC resources](https://doc.zih.tu-dresden.de/jobs_and_resources/hardware_overview/).
+Due to the structuring there are different ways to access
+[HPC resources](https://compendium.hpc.tu-dresden.de/jobs_and_resources/hardware_overview/).
 
 ## Workflow
 
diff --git a/doc.zih.tu-dresden.de/docs/contrib/contribute_browser.md b/doc.zih.tu-dresden.de/docs/contrib/contribute_browser.md
index 137ee23fd50838cfcc11d6c5d465c8213687e28d..9cb7f3082b747c636617e2ce7ee9253f937ac35f 100644
--- a/doc.zih.tu-dresden.de/docs/contrib/contribute_browser.md
+++ b/doc.zih.tu-dresden.de/docs/contrib/contribute_browser.md
@@ -1,7 +1,7 @@
 # Contribute via Browser
 
 In the following, it is outlined how to contribute to the
-[HPC documentation](https://doc.zih.tu-dresden.de/) of
+[HPC documentation](https://compendium.hpc.tu-dresden.de/) of
 [TU Dresden/ZIH](https://tu-dresden.de/zih/) by means of GitLab's web interface using a standard web
 browser only.
 
diff --git a/doc.zih.tu-dresden.de/docs/contrib/contribute_container.md b/doc.zih.tu-dresden.de/docs/contrib/contribute_container.md
index f0d5fe56c8835867bda545948ad7ae0f6bbd09c5..1ccaef449f7bed091f5b794d935a7f69e3bfc3f0 100644
--- a/doc.zih.tu-dresden.de/docs/contrib/contribute_container.md
+++ b/doc.zih.tu-dresden.de/docs/contrib/contribute_container.md
@@ -1,7 +1,7 @@
 # Contribute via Local Clone
 
 In the following, it is outlined how to contribute to the
-[HPC documentation](https://doc.zih.tu-dresden.de/) of
+[HPC documentation](https://compendium.hpc.tu-dresden.de/) of
 [TU Dresden/ZIH](https://tu-dresden.de/zih/) via a local clone of the Git repository. Although, this
 document might seem very long describing complex steps, contributing is quite easy - trust us.
 
diff --git a/doc.zih.tu-dresden.de/docs/data_lifecycle/longterm_preservation.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/longterm_preservation.md
index 0b78f1cdac700aa3a9f3b901686f406463c29378..e19689563523a6490822c875a332c7791c310673 100644
--- a/doc.zih.tu-dresden.de/docs/data_lifecycle/longterm_preservation.md
+++ b/doc.zih.tu-dresden.de/docs/data_lifecycle/longterm_preservation.md
@@ -94,7 +94,7 @@ The intermediate archive is a tape storage easily accessible as a directory
 (`/archiv/<HRSK-project>/` or `/archiv/<login>/`) using the
 [export nodes](../data_transfer/export_nodes.md)
 and
-[Datamover tools](https://doc.zih.tu-dresden.de/data_transfer/datamover/) to move your data to.
+[Datamover tools](../data_transfer/datamover.md) to move your data to.
 For detailed information please visit the
 [ZIH intermediate archive documentation](https://tu-dresden.de/zih/dienste/service-katalog/arbeitsumgebung/backup_archiv/archivierung_am_zih#section-2-1).
 
diff --git a/doc.zih.tu-dresden.de/docs/data_lifecycle/workspaces.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/workspaces.md
index 769e8164a79f0932702a481e331acd64603d25d3..4a035e6db5401f2a71e7811f75e025779e1faf7c 100644
--- a/doc.zih.tu-dresden.de/docs/data_lifecycle/workspaces.md
+++ b/doc.zih.tu-dresden.de/docs/data_lifecycle/workspaces.md
@@ -471,7 +471,7 @@ the following example (which works [for the program g16](../software/nanoscale_s
     #SBATCH --ntasks=1
     ## The optional constraint for the filesystem feature depends
     ## on the filesystem on which you want to use a workspace.
-    ## Documentation here https://doc.zih.tu-dresden.de/jobs_and_resources/slurm/#available-features
+    ## Documentation here https://compendium.hpc.tu-dresden.de/jobs_and_resources/slurm/#filesystem-features
     #SBATCH --constraint=fs_lustre_ssd
     #SBATCH --cpus-per-task=24
 
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index 5441cc6262bd14b9efd8e97c3489bfb63e6cfe06..5c1dbf34584ed085506550e46a516ced292b2a2b 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -157,7 +157,7 @@ site_name: ZIH HPC Compendium
 site_description: ZIH HPC Compendium
 site_author: ZIH Team
 site_dir: public
-site_url: https://doc.zih.tu-dresden.de/
+site_url: https://compendium.hpc.tu-dresden.de/
 
 # uncomment next 3 lines if link to repo should not be displayed in the navbar
 
diff --git a/doc.zih.tu-dresden.de/tud_theme/partials/toc.html b/doc.zih.tu-dresden.de/tud_theme/partials/toc.html
index 341dccc3bbfb70ee83b89c7606ae1dcf3e19a8a6..b3b43288623b3f65d764e64750df0c722186d91a 100644
--- a/doc.zih.tu-dresden.de/tud_theme/partials/toc.html
+++ b/doc.zih.tu-dresden.de/tud_theme/partials/toc.html
@@ -40,7 +40,7 @@
       HPC Support
     </label>
     <p>
-      <img class="operation-status-logo" alt="operation status" src="https://doc.zih.tu-dresden.de/misc/status/bs.php?action=status_icon&dienst=6">
+      <img class="operation-status-logo" alt="operation status" src="https://compendium.hpc.tu-dresden.de/misc/status/bs.php?action=status_icon&dienst=6">
       <a href="http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/aktuelles/betriebsstatus/index_html?action=dienstinfo&dienst=6">
       Operation Status 
       </a>
diff --git a/doc.zih.tu-dresden.de/tud_theme/stylesheets/extra.css b/doc.zih.tu-dresden.de/tud_theme/stylesheets/extra.css
index 18b90854ba952b3799a40e1a93f0373a8c970928..af5c8b463654d00dfe15390e08b58160e94e6dfa 100644
--- a/doc.zih.tu-dresden.de/tud_theme/stylesheets/extra.css
+++ b/doc.zih.tu-dresden.de/tud_theme/stylesheets/extra.css
@@ -206,7 +206,7 @@ p {
   /* exclude relative but not double slash only links */
   [href^="/"]:not([href^="//"]),
   /* exclude page itself */
-  [href*="//doc.zih.tu-dresden.de"],
+  [href*="//compendium.hpc.tu-dresden.de"],
   /* exclude relative links beginning with ../ */
   [href^="\.\./"],
   [href^="misc/"],
diff --git a/doc.zih.tu-dresden.de/util/link-check-config.json b/doc.zih.tu-dresden.de/util/link-check-config.json
index fdbb8373f2ebe4d14098d1af5eb62c15733c8f3c..fe115aed756f4e38c90151c82ae4274c9554b3e5 100644
--- a/doc.zih.tu-dresden.de/util/link-check-config.json
+++ b/doc.zih.tu-dresden.de/util/link-check-config.json
@@ -4,7 +4,7 @@
       "pattern": "^https://gitlab.hrz.tu-chemnitz.de/zih/hpcsupport/hpc-compendium/-/merge_requests/new$"
     },
     {
-      "pattern": "^https://doc.zih.tu-dresden.de/preview$"
+      "pattern": "^https://compendium.hpc.tu-dresden.de/preview$"
     }
   ]
 }