diff --git a/InitUiElements.ts b/InitUiElements.ts
index e4ac7026a7..d7438f3bcb 100644
--- a/InitUiElements.ts
+++ b/InitUiElements.ts
@@ -80,7 +80,7 @@ export class InitUiElements {
                    layoutDefinition: string = "") {
         if (layoutToUse === undefined) {
             console.log("Incorrect layout")
-            new FixedUiElement("Error: incorrect layout <i>" + layoutName + "</i><br/><a href='https://pietervdvn.github.io/MapComplete/index.html'>Go back</a>").AttachTo("centermessage").onClick(() => {
+            new FixedUiElement("Error: incorrect layout <i>" + layoutName + "</i><br/><a href='https://kletterspots.de/index.html'>Go back</a>").AttachTo("centermessage").onClick(() => {
             });
             throw "Incorrect layout"
         }
diff --git a/UI/CustomGenerator/SharePanel.ts b/UI/CustomGenerator/SharePanel.ts
index 5fcd6ac7fb..aa13441ee7 100644
--- a/UI/CustomGenerator/SharePanel.ts
+++ b/UI/CustomGenerator/SharePanel.ts
@@ -42,7 +42,7 @@ export default class SharePanel extends UIElement {
                 "Copy the json configuration from the 'save-tab', paste it between the 'nowiki'-tags in the Wiki",
                 "Click 'save' to save the wiki page",
                 "Share the link with the url parameter <span class='literal-code'>userlayout=wiki:YOURWIKIPAGE</span>, e.g. " +
-                `<a href='./index.html?userlayout=${proposedNameEnc}' target='_blank'>https://pietervdvn.github.io/MapComplete/index.html?userlayout=${proposedNameEnc}</a>`
+                `<a href='./index.html?userlayout=${proposedNameEnc}' target='_blank'>https://kletterspots.de?userlayout=${proposedNameEnc}</a>`
             ].map(li => `<li>${li}</li>`),
 
             "</ol>",
diff --git a/UI/ShareScreen.ts b/UI/ShareScreen.ts
index c9ea0263b2..d3b6828a0a 100644
--- a/UI/ShareScreen.ts
+++ b/UI/ShareScreen.ts
@@ -147,13 +147,13 @@ export class ShareScreen extends UIElement {
         const url = (currentLocation ?? new UIEventSource(undefined)).map(() => {
 
 
-            let literalText = "https://pietervdvn.github.io/MapComplete/" + layout.id.toLowerCase() + ".html"
+            let literalText = "https://kletterspots.de/" + layout.id.toLowerCase() + ".html"
 
             const parts = Utils.NoEmpty(Utils.NoNull(optionParts.map((eventSource) => eventSource.data)));
 
             let hash = "";
             if (layoutDefinition !== undefined) {
-                literalText = "https://pietervdvn.github.io/MapComplete/index.html"
+                literalText = "https://kletterspots.de/"
                 if (layout.id.startsWith("wiki:")) {
                     parts.push("userlayout=" + encodeURIComponent(layout.id))
                 } else {
diff --git a/scripts/createLayouts.ts b/scripts/createLayouts.ts
index 86dfd85d8b..5ede699d37 100644
--- a/scripts/createLayouts.ts
+++ b/scripts/createLayouts.ts
@@ -86,11 +86,11 @@ function generateWikiEntry(layout: LayoutConfig){
         auth=`Yes, by ${layout.maintainer};`
     }
     return `{{service_item
-|name= [https://pietervdvn.github.io/MapComplete/${layout.id}.html ${layout.id}]
+|name= [https://kletterspots.de/${layout.id}.html ${layout.id}]
 |region= Worldwide
 |lang= ${languages}
 |descr= A MapComplete theme: ${Translations.W(layout.description).InnerRender()}
-|material= {{yes|[https://github.com/pietervdvn/MapComplete ${auth}]}}
+|material= {{yes|[https://kletterspots.de/ ${auth}]}}
 |image= MapComplete_Screenshot.png
 |genre= POI, editor, ${layout.id}
 }}`