diff --git a/scripts/generateLayouts.ts b/scripts/generateLayouts.ts
index 526c642ac..e759f54fb 100644
--- a/scripts/generateLayouts.ts
+++ b/scripts/generateLayouts.ts
@@ -326,15 +326,12 @@ class GenerateLayouts extends Script {
         }
     ): Promise<string> {
         const apiUrls: string[] = [
-            ...Constants.defaultOverpassUrls,
+            ...Constants.allServers,
             Constants.countryCoderEndpoint,
             Constants.nominatimEndpoint,
             "https://www.openstreetmap.org",
             "https://api.openstreetmap.org",
             "https://pietervdvn.goatcounter.com",
-            "https://cache.mapcomplete.org",
-            "https://proxy.mapcomplete.org",
-            "https://proxy0.mapcomplete.org",
         ].concat(...(await this.eliUrls()))
 
         SpecialVisualizations.specialVisualizations.forEach((sv) => {
diff --git a/src/Models/Constants.ts b/src/Models/Constants.ts
index 6c35984ff..cf66d8e47 100644
--- a/src/Models/Constants.ts
+++ b/src/Models/Constants.ts
@@ -169,6 +169,8 @@ export default class Constants {
     public static readonly maptilerApiKey = "GvoVAJgu46I5rZapJuAy"
     public static readonly SummaryServer: string = Constants.config.summary_server
 
+    public static allServers: string[] = [Constants.SummaryServer, Constants.VectorTileServer, Constants.GeoIpServer, Constants.ErrorReportServer,  Constants.countryCoderEndpoint, Constants.osmAuthConfig.url, Constants.nominatimEndpoint, Constants.linkedDataProxy, ...Constants.defaultOverpassUrls]
+
     private static isRetina(): boolean {
         if (Utils.runningFromConsole) {
             return false