diff --git a/cloud-platform.md b/cloud-platform.md
index c07ee1fe03f6f0f8ab9a3b2db86b7e3c9e5bfc91..a1cdddd05ff8c2a68b9bff89c7a2935df6405ea2 100644
--- a/cloud-platform.md
+++ b/cloud-platform.md
@@ -42,4 +42,4 @@ Later versions will contain more enhanced features like
 If you have suggestions about additional use cases and functionality, please feel free to contact us. We appreciate all input from the user community!
 
 ## Contact us:
-`contact-at-hifis.net`
+[contact@hifis.net](mailto:contact@hifis.net)
diff --git a/contact.md b/contact.md
index b269c8b008f430ba0a3da7c03d176285cab5e8a6..e8b282103bc415607ed28a799c080435e01ec243 100644
--- a/contact.md
+++ b/contact.md
@@ -18,4 +18,4 @@ lang_ref: contact
 [Helmholtz-Zentrum Dresden-Rossendorf (HZDR)](https://www.hzdr.de/)
 
 ## Mail:
-`contact-at-hifis.net`
+[contact@hifis.net](mailto:contact@hifis.net)
diff --git a/faq.md b/faq.md
index f05bf3ee2974d5cdbaaf7e490ffbdf83d819ba87..0486ac7ce8617eecb9a93ef32b2c74d3c59ca361 100644
--- a/faq.md
+++ b/faq.md
@@ -34,7 +34,7 @@ and
 [Support platform](https://software.hifis.net/services/consulting) is already available.
 
 #### [Anything I can do to get things done faster?][4]
-We have several pilot cloud services and installations running. Please [contact our HIFIS Office](mailto:office@hifis.net) if you need urgent assistance.
+We have several pilot cloud services and installations running. Please [contact us](mailto:contact@hifis.net) if you need urgent assistance.
 
 #### [Where can I register for a newsletter?][6]
 Currently, we do not send newsletters as it would imply for us to collect large amounts of personal data. To stay updated, you are invited to check out 
@@ -46,7 +46,7 @@ besides, of course, regularly checking our website and [**news section!**](news)
 #### [My Helmholtz center is not directly involved into HIFIS. Do you still help me?][5]
 Yes, of course. HIFIS is a Helmholtz-wide platform that aims to
 provide offers for **all** Helmholtz centers. 
-Please [contact our HIFIS Office](mailto:office@hifis.net) or any of the [HIFIS team members](team) to get assistance.
+Please [contact us](mailto:contact@hifis.net) or any of the [HIFIS team members](team) to get assistance.
 
 
 #### [How should I acknowledge HIFIS assistance in a publication?][10]
diff --git a/you-and-hifis/index.md b/you-and-hifis/index.md
index 725d0c6731416f7fd1df0a6ca3e3eb97e7299ebc..fb1df2cbadc8f9d8282bf527797a37262ec15046 100644
--- a/you-and-hifis/index.md
+++ b/you-and-hifis/index.md
@@ -26,9 +26,9 @@ The cloud team is currently preparing the Initial Service Portfolio.
 In interviews with different groups of scientists and with IT specialists of all centers a list of over 100 potential IT services was compiled.
 Based on an evaluation matrix with a list of selection criteria, approximately 20 of 25 services will be compiled as an Initial Service Portfolio. 
 
-The most promising candidates so far are e.g. JypyterHub, OpenStack, GitLab, Storage on demand, Sync&Share, Kubernetes, Redmine, LimeSurvey, Mattermost, Rocket.Chat, Zammad, Singularity, etc.
+The most promising candidates so far are e.g. JupyterHub, OpenStack, GitLab, Storage on demand, Sync&Share, Kubernetes, Redmine, LimeSurvey, Mattermost, Rocket.Chat, Zammad, Singularity, etc.
 
-The first IT services are expected to be technically available by the end of 2020. Please [contact us](mailto:office@hifis.net) if you are interested in using them.
+The first IT services are expected to be technically available by the end of 2020. Please [contact us](mailto:contact@hifis.net) if you are interested in using them.
 
 #### Becoming Service Provider for a new Service
 You have a new IT service, application or program and you would like to provide it to other users via the Helmholtz Cloud, e.g. another Helmholtz Centre or a European partner organization?
@@ -36,7 +36,7 @@ You have a new IT service, application or program and you would like to provide
 Please get in touch with us. The portfolio of the Helmholtz Cloud will be continuously expanded and updated.
 
 #### Your feedback about the service portfolio
-Your contribution is very valuable to us. We would like to exchange views with our users on a regular basis in order optimize the composition of the service portfolio continuously. [Please write to us](mailto:office@hifis.net) if we may contact you.
+Your contribution is very valuable to us. We would like to exchange views with our users on a regular basis in order optimize the composition of the service portfolio continuously. [Please write to us](mailto:contact@hifis.net) if we may contact you.
 
 #### Helmholtz Cloud Service Portfolio
 The Helmholtz Cloud will appear as a federated cloud. All services are hosted by one of the 19 Helmholtz centers. There will be some services that are available for all Helmholtz employees. But in many cases, it will be unavoidable to sign an additional agreement between the providing center and the using organization. So, the services you can use will depend if the agreements between your organization and the providing Helmholtz center exists.