diff --git a/_config.yml b/_config.yml
index afad6f0..c6aa3a8 100644
--- a/_config.yml
+++ b/_config.yml
@@ -49,7 +49,8 @@ nav_external_links:
   - title: Project statistics
     url: https://www.openhub.net/p/catrobat
   - title: Hour Of Code
-    url: /hour-of-code/
+    url: https://developer.catrobat.org/pages/hour-of-code
+
 
 # Footer
 back_to_top: true
diff --git a/hour-of-code/index.html b/hour-of-code/index.html
index 8df682d..3149267 100644
--- a/hour-of-code/index.html
+++ b/hour-of-code/index.html
@@ -170,7 +170,7 @@ <h3>Where can I find more information about the licenses of this event?</h3>
             are available under Free Open Source and Creative Commons licenses.
             These licenses allow the usage and adaption of all content, as long
             as they are correctly attributed and are published under the same licenses.</p>
-          <p>Find more detailed information on the page <a target="_blank" href="{{ site.baseurl }}/licenses_of_uploaded_catrobat_programs">"Licenses of uploaded Catrobat projects"</a>.</p>
+          <p>Find more detailed information on the page <a target="_blank" href="/licenses_of_uploaded_catrobat_programs">"Licenses of uploaded Catrobat projects"</a>.</p>
 
           <h3>What do I have to consider for participating at the game jam?</h3>
           <p>Please just follow the instructions <a href="#about">above</a>. That's it!</p>
@@ -220,9 +220,9 @@ <h3>How can I promote this event in my community?</h3>
         <a target="_blank" href="https://catrob.at/fb"><img src="img/social/facebook.png" class="social"></a>
     	  <a target="_blank" href="https://catrob.at/pctwitter"><img src="img/social/twitter.png" class="social"></a>
     </div>
-    <a href="{{ site.baseurl }}/imprint/">Imprint &amp; Contact</a> |
-    <a href="{{ site.baseurl }}/privacy_policy/">Privacy</a> |
-    <a href="{{ site.baseurl }}/pages/legal/">Legal</a> |
+    <a href="/imprint/">Imprint &amp; Contact</a> |
+    <a href="/privacy_policy/">Privacy</a> |
+    <a href="/pages/legal/">Legal</a> |
     <a target="_blank" href="https://www.catrobat.org/">©&nbsp;2023 Catrobat</a>
     </div>
 
diff --git a/pages/credits/contributors.md b/pages/credits/contributors.md
index 9855ea4..6c7dbad 100644
--- a/pages/credits/contributors.md
+++ b/pages/credits/contributors.md
@@ -6,6 +6,7 @@ parent: Credits
 permalink: /contributors/
 redirect_from:
   - /credits.html
+  - /credits
 ---
 
 ## The Catrobat development team
diff --git a/pages/credits/special-thanks.md b/pages/credits/special-thanks.md
index c4837b5..3aa7940 100644
--- a/pages/credits/special-thanks.md
+++ b/pages/credits/special-thanks.md
@@ -5,6 +5,7 @@ nav_order: 2
 parent: Credits
 redirect_from:
   - /special_thanks.html
+  - /special_thanks
 ---
 
 ## The Catrobat team would like to give special thanks to:
diff --git a/pages/legal/imprint.md b/pages/legal/imprint.md
index 0866a7f..6ebaf8e 100644
--- a/pages/legal/imprint.md
+++ b/pages/legal/imprint.md
@@ -5,6 +5,7 @@ layout: home-with-socials
 parent: Legal
 redirect_from:
   - /imprint.html
+  - /imprint
 ---
 
 ## Imprint
diff --git a/pages/legal/licenses/additional-terms.md b/pages/legal/licenses/additional-terms.md
index 7a3ab43..69f70f8 100644
--- a/pages/legal/licenses/additional-terms.md
+++ b/pages/legal/licenses/additional-terms.md
@@ -6,6 +6,7 @@ grand_parent: Legal
 nav_order: 999
 redirect_from:
   - /license_additional_term.html
+  - /license_additional_term
 ---
 
 # Additional Term Exception under section 7 of the GNU Affero General Public License, version 3, for the parts of the Catrobat system necessary for running a Catrobat Program
diff --git a/pages/legal/licenses/agpl-v3.md b/pages/legal/licenses/agpl-v3.md
index fb7e5a6..d03a7f3 100644
--- a/pages/legal/licenses/agpl-v3.md
+++ b/pages/legal/licenses/agpl-v3.md
@@ -6,6 +6,7 @@ grand_parent: Legal
 nav_order: 101
 redirect_from:
   - /agpl_v3.html
+  - /agpl_v3
 ---
 
 Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
diff --git a/pages/legal/licenses/catrobat.md b/pages/legal/licenses/catrobat.md
index 9d1dfa1..f868b08 100644
--- a/pages/legal/licenses/catrobat.md
+++ b/pages/legal/licenses/catrobat.md
@@ -6,6 +6,7 @@ grand_parent: Legal
 nav_order: 1
 redirect_from:
   - /licenses.html
+  - /licenses
 ---
 
 ## Licenses of the Catrobat System
diff --git a/pages/legal/licenses/cc-by-sa-4.0.md b/pages/legal/licenses/cc-by-sa-4.0.md
index 9a4233b..aa0ea66 100644
--- a/pages/legal/licenses/cc-by-sa-4.0.md
+++ b/pages/legal/licenses/cc-by-sa-4.0.md
@@ -6,6 +6,7 @@ grand_parent: Legal
 nav_order: 100
 redirect_from:
   - /ccbysa_v4.html
+  - /ccbysa_v4
 ---
 
 ## Creative Commons Attribution-ShareAlike 4.0 International
diff --git a/pages/legal/licenses/uploaded-catrobat-programs.md b/pages/legal/licenses/uploaded-catrobat-programs.md
index f08037b..3ec1f0e 100644
--- a/pages/legal/licenses/uploaded-catrobat-programs.md
+++ b/pages/legal/licenses/uploaded-catrobat-programs.md
@@ -6,6 +6,7 @@ grand_parent: Legal
 nav_order: 2
 redirect_from:
   - /licenses_of_uploaded_catrobat_programs.html
+  - /licenses_of_uploaded_catrobat_programs
 ---
 
 ## Licenses of uploaded Catrobat programs
diff --git a/pages/legal/policies/copyright.md b/pages/legal/policies/copyright.md
index a4ef0cf..1de338f 100644
--- a/pages/legal/policies/copyright.md
+++ b/pages/legal/policies/copyright.md
@@ -5,6 +5,7 @@ parent: Policies
 grand_parent: Legal
 redirect_from:
   - /copyright_policy.html
+  - /copyright_policy
 ---
 
 ## Copyright Policy
diff --git a/pages/legal/policies/privacy.md b/pages/legal/policies/privacy.md
index 884b786..8e19ca2 100644
--- a/pages/legal/policies/privacy.md
+++ b/pages/legal/policies/privacy.md
@@ -5,6 +5,7 @@ parent: Policies
 grand_parent: Legal
 redirect_from:
   - /privacy_policy.html
+  - /privacy_policy
 ---
 
 
diff --git a/pages/legal/terms-of-use-and-service.md b/pages/legal/terms-of-use-and-service.md
index 3233b5e..7d739c4 100644
--- a/pages/legal/terms-of-use-and-service.md
+++ b/pages/legal/terms-of-use-and-service.md
@@ -5,6 +5,7 @@ layout: home-with-socials
 parent: Legal
 redirect_from:
   - /terms_of_use_and_service.html
+  - /terms_of_use_and_service
 ---