diff --git a/_data/navigation.yml b/_data/navigation.yml
index 485ccdbfc3558ab3c95972383029e0a241281380..a5bf7213f94d319e258c82ab29cfee4dc8edc780 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -24,20 +24,20 @@ header:
           url: "roadmap/"
 
         - title: Partners
-          url: "partners"
+          url: "partners.html"
 
         - title: Team
-          url: "team"
+          url: "team.html"
 
         - title: Jobs
           url: "https://www.helmholtz.de/en/jobs_talent/job_vacancies/"
 
 footer:
          - title: Contact
-           url: contact
+           url: "contact.html"
 
          - title: FAQ
-           url: faq
+           url: "faq.html"
            
          - title: Imprint
            url: "https://www.desy.de/imprint"
diff --git a/_includes/frontpage/title-content.html b/_includes/frontpage/title-content.html
index 3ba008c86c38609de8bc051cfe7f49e6371a65fe..a73ff1748874e135f1b04341a2f1aa1b7fefb7cc 100644
--- a/_includes/frontpage/title-content.html
+++ b/_includes/frontpage/title-content.html
@@ -4,7 +4,7 @@
 </div>
 <div class="services-box">
     <div class="services-title-buttons">
-        <a href="{{ '/cloud-platform' | relative_url }}" class="btn btn-light btn-lg text-dark">
+        <a href="{{ '/cloud-platform.html' | relative_url }}" class="btn btn-light btn-lg text-dark">
             <i class="fas fa-cloud"></i> Helmholtz Cloud
         </a>
         <a href="https://software.hifis.net" class="btn btn-light btn-lg text-dark">
@@ -13,7 +13,7 @@
         <a href="{{ '/you-and-hifis' | relative_url }}" class="btn btn-light btn-lg text-dark">
             <i class="fas fa-user-plus"></i> HIFIS for you
         </a>
-        <a href="{{ '/contact' | relative_url }}" class="btn btn-light btn-lg text-dark">
+        <a href="{{ '/contact.html' | relative_url }}" class="btn btn-light btn-lg text-dark">
             <i class="fas fa-question"></i> Support + Contact
         </a>
     </div>
diff --git a/you-and-hifis/index.md b/you-and-hifis/index.md
index bf0ccb91f1f711326584ef0fc8efd811e4703370..e14b509139fc3d145fa8857c1d501380368c1ee5 100644
--- a/you-and-hifis/index.md
+++ b/you-and-hifis/index.md
@@ -14,7 +14,7 @@ excerpt:
 Our purpose is to support you, as a scientist, Helmholtz employee or research project.
 To this aim, since summer 2019, we are setting up the HIFIS platform, that is building
 
-- the [**Helmholtz Cloud**](../cloud-platform), providing a portfolio of seamlessly accessible IT services to simplify your daily work,
+- the [**Helmholtz Cloud**]({% link cloud-platform.md %}), providing a portfolio of seamlessly accessible IT services to simplify your daily work,
 - a **Helmholtz-wide login mechanism**, the [Helmholtz AAI]({% post_url 2020/07/2020-07-24-helmholtz-aai %}),
 - a stable, high-bandwidth **network infrastructure** connecting all Helmholtz centers,
 - [**Software services**](#software-services) to provide you with a common platform,