diff --git a/maps/GUGIK-orto.xml b/maps/GUGIK-orto.xml
index d13414e..4853d6d 100644
--- a/maps/GUGIK-orto.xml
+++ b/maps/GUGIK-orto.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map xmlns="http://www.gpxsee.org/map/1.4" type="WMTS">
 	<name>GUGIK Ortofotomapa</name>
-	<url>https://mapy.geoportal.gov.pl/wss/service/WMTS/guest/wmts/ORTO</url>
+	<url>https://mapy.geoportal.gov.pl/wss/service/PZGIK/ORTO/WMTS/StandardResolution</url>
 	<copyright>© Główny Urząd Geodezji i Kartografii</copyright>
 	<format>image/jpeg</format>
 	<layer>ORTOFOTOMAPA</layer>
diff --git a/maps/Norgeskart.xml b/maps/Norgeskart.xml
index da93a90..26bfe84 100644
--- a/maps/Norgeskart.xml
+++ b/maps/Norgeskart.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.4" type="WMS">
+<map xmlns="http://www.gpxsee.org/map/1.4" type="WMTS">
 	<name>Topografisk Norgeskart</name>
-	<url>http://openwms.statkart.no/skwms1/wms.topo4</url>
+	<url>https://cache.kartverket.no/norgeskart_bakgrunn/v1/wmts/1.0.0</url>
 	<copyright>Norwegian Mapping Authority (CC BY 4.0)</copyright>
-	<layer>topo4_WMS</layer>
-	<crs>EPSG:25833</crs>
+	<layer>norgeskart_bakgrunn</layer>
+	<set>utm33n</set>
 </map>
diff --git a/maps/andorra-orto.xml b/maps/andorra-orto.xml
index b3ae206..b92a5e2 100644
--- a/maps/andorra-orto.xml
+++ b/maps/andorra-orto.xml
@@ -4,5 +4,5 @@
 	<url>https://www.ideandorra.ad/Serveis/wms</url>
 	<copyright>IDE Andorra</copyright>
 	<layer>wmsorto2012:orto2012</layer>
-	<crs>EPSG:23031</crs>
+	<crs>EPSG:27563</crs>
 </map>
diff --git a/maps/andorra-topo.xml b/maps/andorra-topo.xml
index 652f75e..f68ca0b 100644
--- a/maps/andorra-topo.xml
+++ b/maps/andorra-topo.xml
@@ -4,5 +4,5 @@
 	<url>https://www.ideandorra.ad/Serveis/wms</url>
 	<copyright>IDE Andorra</copyright>
 	<layer>fons</layer>
-	<crs>EPSG:23031</crs>
+	<crs>EPSG:27563</crs>
 </map>