diff --git a/doc.zih.tu-dresden.de/docs/access/desktop_cloud_visualization.md b/doc.zih.tu-dresden.de/docs/access/desktop_cloud_visualization.md
index e3fe6e8f25e5a59c876454807410c05c2494f8d3..31dca5e0ce4d1aaf34754d998f934fad49ad4cb4 100644
--- a/doc.zih.tu-dresden.de/docs/access/desktop_cloud_visualization.md
+++ b/doc.zih.tu-dresden.de/docs/access/desktop_cloud_visualization.md
@@ -36,7 +36,7 @@ direct rendering: Yes
 [...]
 ```
 
-If direct rendering is not set to `Yes`, please contact [HPC support](mailto:hpcsupport@zih.tu-dresden.de).
+If direct rendering is not set to `Yes`, please contact [HPC support](mailto:hpc-support@tu-dresden.de).
 
 - Expand LD_LIBRARY_PATH:
 
diff --git a/doc.zih.tu-dresden.de/docs/archive/migrate_to_atlas.md b/doc.zih.tu-dresden.de/docs/archive/migrate_to_atlas.md
index ab44cf9bcba0898c0461be3b0d3774d61cd8d6a4..af0a0ca650fa4ca18b5131d2960feea946de783e 100644
--- a/doc.zih.tu-dresden.de/docs/archive/migrate_to_atlas.md
+++ b/doc.zih.tu-dresden.de/docs/archive/migrate_to_atlas.md
@@ -90,7 +90,7 @@ re-compile made sense.
 ### Applications
 
 As a default, all applications provided by ZIH should run an atlas
-without problems. Please [tell us](mailto:hpcsupport@zih.tu-dresden.de)
+without problems. Please [tell us](mailto:hpc-support@tu-dresden.de)
 if you are missing your application or experience severe performance
 degradation. Please include "Atlas" in your subject.
 
diff --git a/doc.zih.tu-dresden.de/docs/archive/scs5_software.md b/doc.zih.tu-dresden.de/docs/archive/scs5_software.md
index 5aadc995ef4c07d5009cc959388e61889edd3a86..f00c697d46e19c918116e332efd59a5508469962 100644
--- a/doc.zih.tu-dresden.de/docs/archive/scs5_software.md
+++ b/doc.zih.tu-dresden.de/docs/archive/scs5_software.md
@@ -73,7 +73,7 @@ that was built especially for SCS5.
 ### Which modules should I use?
 
 If possible, please use the modules from **modenv/scs5**. In case there is a certain software
-missing, you can write an [email to hpcsupport](mailto:hpcsupport@zih.tu-dresden.de) and we will try
+missing, you can write an [email to hpcsupport](mailto:hpc-support@tu-dresden.de) and we will try
 to install the latest version of this particular software for you.
 
 However, if you still need *older* versions of some software, you have to resort to using the
diff --git a/doc.zih.tu-dresden.de/docs/contrib/content_rules.md b/doc.zih.tu-dresden.de/docs/contrib/content_rules.md
index 1f54cd072b71e92e975864be51f2e7701a0bcd1c..0b01ac4dd677d8d7d181b10879e1f78a90204b1c 100644
--- a/doc.zih.tu-dresden.de/docs/contrib/content_rules.md
+++ b/doc.zih.tu-dresden.de/docs/contrib/content_rules.md
@@ -33,7 +33,7 @@ These licenses also apply to your contributions.
 
 If you are in doubt, please contact us either via
 [GitLab Issue](https://gitlab.hrz.tu-chemnitz.de/zih/hpcsupport/hpc-compendium/-/issues)
-or via [Email](mailto:hpcsupport@zih.tu-dresden.de).
+or via [Email](mailto:hpc-support@tu-dresden.de).
 
 ## Quick Overview
 
diff --git a/doc.zih.tu-dresden.de/docs/contrib/howto_contribute.md b/doc.zih.tu-dresden.de/docs/contrib/howto_contribute.md
index 065f40b75db35cd0ec4ac5c3e1a8fa51347c546e..77952d33eafc59661a9e616b208ffc46aa5e752e 100644
--- a/doc.zih.tu-dresden.de/docs/contrib/howto_contribute.md
+++ b/doc.zih.tu-dresden.de/docs/contrib/howto_contribute.md
@@ -114,7 +114,7 @@ documentation.
 !!! warning "HPC support"
 
     Non-documentation issues and requests need to be send as ticket to
-    [hpcsupport@zih.tu-dresden.de](mailto:hpcsupport@zih.tu-dresden.de).
+    [hpc-support@tu-dresden.de](mailto:hpc-support@tu-dresden.de).
 
 ## Contribute via Web IDE
 
diff --git a/doc.zih.tu-dresden.de/docs/index.md b/doc.zih.tu-dresden.de/docs/index.md
index 64802daa9ae83761fb147961185fec3322880f0b..c93b8079acd880e6900b94c91359702bbddbc44f 100644
--- a/doc.zih.tu-dresden.de/docs/index.md
+++ b/doc.zih.tu-dresden.de/docs/index.md
@@ -27,7 +27,7 @@ Please also find out the other ways you could contribute in our
 !!! tip "Reminder"
 
     Non-documentation issues and requests need to be send to
-    [hpcsupport@zih.tu-dresden.de](mailto:hpcsupport@zih.tu-dresden.de).
+    [hpc-support@tu-dresden.de](mailto:hpc-support@tu-dresden.de).
 
 ## News
 
diff --git a/doc.zih.tu-dresden.de/docs/jobs_and_resources/arm_hpc_devkit.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/arm_hpc_devkit.md
index 0f358bec3d47224da657a34a8d38b57bb0aa4354..d2930351aa58fd4a111d386f817aef923613c08a 100644
--- a/doc.zih.tu-dresden.de/docs/jobs_and_resources/arm_hpc_devkit.md
+++ b/doc.zih.tu-dresden.de/docs/jobs_and_resources/arm_hpc_devkit.md
@@ -24,7 +24,7 @@ Further information about this new system can be found on the following websites
 ## Getting Access
 
 To get access to the developer kit, write a mail to
-[the hpcsupport team](mailto:hpcsupport@zih.tu-dresden.de)
+[the hpcsupport team](mailto:hpc-support@tu-dresden.de)
 with your ZIH login and a short description, what you want to use the developer kit for.
 
 After you have gained access, you can log into the developer kit system via SSH from the login
diff --git a/doc.zih.tu-dresden.de/docs/jobs_and_resources/overview.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/overview.md
index 20a542d3abed3cd59b299c5d6560bc451f3eead0..6b36d18f742999349aca2f8adbf8f742733c1d53 100644
--- a/doc.zih.tu-dresden.de/docs/jobs_and_resources/overview.md
+++ b/doc.zih.tu-dresden.de/docs/jobs_and_resources/overview.md
@@ -99,7 +99,7 @@ project.
 Please send your request **7 working days** before the reservation should start (as that's our
 maximum time limit for jobs and it is therefore not guaranteed that resources are available on
 shorter notice) with the following information to the
-[HPC support](mailto:hpcsupport@zih.tu-dresden.de?subject=Request%20for%20a%20exclusive%20reservation%20of%20hardware&body=Dear%20HPC%20support%2C%0A%0AI%20have%20the%20following%20request%20for%20a%20exclusive%20reservation%20of%20hardware%3A%0A%0AProject%3A%0AReservation%20owner%3A%0ASystem%3A%0AHardware%20requirements%3A%0ATime%20window%3A%20%3C%5Byear%5D%3Amonth%3Aday%3Ahour%3Aminute%20-%20%5Byear%5D%3Amonth%3Aday%3Ahour%3Aminute%3E%0AReason%3A):
+[HPC support](mailto:hpc-support@tu-dresden.de?subject=Request%20for%20a%20exclusive%20reservation%20of%20hardware&body=Dear%20HPC%20support%2C%0A%0AI%20have%20the%20following%20request%20for%20a%20exclusive%20reservation%20of%20hardware%3A%0A%0AProject%3A%0AReservation%20owner%3A%0ASystem%3A%0AHardware%20requirements%3A%0ATime%20window%3A%20%3C%5Byear%5D%3Amonth%3Aday%3Ahour%3Aminute%20-%20%5Byear%5D%3Amonth%3Aday%3Ahour%3Aminute%3E%0AReason%3A):
 
 - `Project:` *Which project will be credited for the reservation?*
 - `Reservation owner:` *Who should be able to run jobs on the
diff --git a/doc.zih.tu-dresden.de/docs/jobs_and_resources/sd_flex.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/sd_flex.md
index 27a39b06a6444ebd13a5a4e86c74cf1b17317e8d..f4788c1cf8b4b0cda39f891eeac73f3c5c60cf5e 100644
--- a/doc.zih.tu-dresden.de/docs/jobs_and_resources/sd_flex.md
+++ b/doc.zih.tu-dresden.de/docs/jobs_and_resources/sd_flex.md
@@ -13,7 +13,7 @@ There are 370 TB of NVMe devices installed. For immediate access for all project
 of fast NVMe storage is available at `/nvme/1/<projectname>`. A quota of
 100 GB per project on this NVMe storage is set.
 
-With a more detailed proposal to [hpcsupport@zih.tu-dresden.de](mailto:hpcsupport@zih.tu-dresden.de)
+With a more detailed proposal to [hpc-support@tu-dresden.de](mailto:hpc-support@tu-dresden.de)
 on how this unique system (large shared memory + NVMe storage) can speed up their computations, a
 project's quota can be increased or dedicated volumes of up to the full capacity can be set up.
 
diff --git a/doc.zih.tu-dresden.de/docs/quickstart/getting_started.md b/doc.zih.tu-dresden.de/docs/quickstart/getting_started.md
index 89cf13134f570bd45042580d586cd362f1c46ab6..e7decdf0b94e6e056460838658b7810becefe8b1 100644
--- a/doc.zih.tu-dresden.de/docs/quickstart/getting_started.md
+++ b/doc.zih.tu-dresden.de/docs/quickstart/getting_started.md
@@ -231,7 +231,7 @@ The approach depends on the data volume: up to 100 MB or above.
 !!! caution "Terabytes of data"
 
     If you are planning to move terabytes or even more from an outside machine into the ZIH system,
-    please contact the ZIH [HPC support](mailto:hpcsupport@tu-dresden.de) in advance.
+    please contact the ZIH [HPC support](mailto:hpc-support@tu-dresden.de) in advance.
 
 ### Permission Rights
 
@@ -396,7 +396,7 @@ For additional information refer to the detailed documentation on [modules](../s
     e.g. `numpy`, `tensorflow` or `pytorch`.
     Those modules may provide much better performance than the packages found on PyPi
     (installed via `pip`) which have to work on any system while our installation is optimized for
-    the ZIH system to make the best use of the specific CPUs and GPUs found here.  
+    the ZIH system to make the best use of the specific CPUs and GPUs found here.
     However the Python package ecosystem (like others) is very heterogeneous and dynamic,
     with daily updates.
     The central update cycle for software on the ZIH HPC system is approximately every six months.
diff --git a/doc.zih.tu-dresden.de/docs/software/nanoscale_simulations.md b/doc.zih.tu-dresden.de/docs/software/nanoscale_simulations.md
index 392124c49f16e5fc4c2dcb1774782d70180682c6..d34fa04fa4e52277f6f1540a835450c878874f58 100644
--- a/doc.zih.tu-dresden.de/docs/software/nanoscale_simulations.md
+++ b/doc.zih.tu-dresden.de/docs/software/nanoscale_simulations.md
@@ -53,7 +53,7 @@ particularly designed for ab-initio molecular dynamics. For examples and documen
 [CPMD homepage](https://www.lcrc.anl.gov/for-users/software/available-software/cpmd/).
 
 CPMD is currently not installed as a module.
-Please, contact [hpcsupport@zih.tu-dresden.de](mailto:hpcsupport@zih.tu-dresden.de) if you need assistance.
+Please, contact [hpc-support@tu-dresden.de](mailto:hpc-support@tu-dresden.de) if you need assistance.
 
 ## GAMESS
 
@@ -108,7 +108,7 @@ intermediates and transition structures.
 
 Access to the Gaussian installation on our system is limited to members
 of the  UNIX group `s_gaussian`. Please, contact
-[hpcsupport@zih.tu-dresden.de](mailto:hpcsupport@zih.tu-dresden.de) if you can't
+[hpc-support@tu-dresden.de](mailto:hpc-support@tu-dresden.de) if you can't
 access it, yet wish to use it.
 
 ### Guidance on Data Management with Gaussian
diff --git a/doc.zih.tu-dresden.de/docs/support/support.md b/doc.zih.tu-dresden.de/docs/support/support.md
index 3582ae264c4ead7f41acdf14e9877af91b8c2d57..13bf47db723831a42684cbf8b4229581aec8c9ec 100644
--- a/doc.zih.tu-dresden.de/docs/support/support.md
+++ b/doc.zih.tu-dresden.de/docs/support/support.md
@@ -3,7 +3,7 @@
 ## Create a Ticket
 
 The best way to ask for help send a message to
-[hpcsupport@zih.tu-dresden.de](mailto:hpcsupport@zih.tu-dresden.de) with a
+[hpc-support@tu-dresden.de](mailto:hpc-support@tu-dresden.de) with a
 detailed description of your problem.
 
 It should include: