diff --git a/libs/opmapcontrol/src/core/maptype.h b/libs/opmapcontrol/src/core/maptype.h
index efadd9b32..56a6f3003 100644
--- a/libs/opmapcontrol/src/core/maptype.h
+++ b/libs/opmapcontrol/src/core/maptype.h
@@ -99,7 +99,7 @@ namespace core {
 
             YandexMapRu = 5000,
             Statkart_Topo = 5500,
-            Statkart_Basemap = 5501,
+            Svalbard = 5501,
             Eniro_Topo = 5510,
 
             JapanMap = 6001,
diff --git a/libs/opmapcontrol/src/core/opmaps.cpp b/libs/opmapcontrol/src/core/opmaps.cpp
index e51204a4c..eb4643147 100644
--- a/libs/opmapcontrol/src/core/opmaps.cpp
+++ b/libs/opmapcontrol/src/core/opmaps.cpp
@@ -204,9 +204,9 @@ namespace core {
                         qheader.setRawHeader("Referrer", "http://norgeskart.no/");
                     }
                     break;
-                case MapType::Statkart_Basemap:
+                case MapType::Svalbard:
                     {
-                        qheader.setRawHeader("Referrer", "http://norgeskart.no/");
+                        qheader.setRawHeader("Referrer", "http://npolar.no/");
                     }
                     break;
                 case MapType::Eniro_Topo:
diff --git a/libs/opmapcontrol/src/core/urlfactory.cpp b/libs/opmapcontrol/src/core/urlfactory.cpp
index ead1d3101..737453d08 100644
--- a/libs/opmapcontrol/src/core/urlfactory.cpp
+++ b/libs/opmapcontrol/src/core/urlfactory.cpp
@@ -498,17 +498,17 @@ namespace core {
             break;
         case MapType::Statkart_Topo:
             {
-                return QString("http://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo4&zoom=%1&x=%2&y=%3").arg(zoom).arg(pos.X()).arg(pos.Y());
+                return QString("https://cache.kartverket.no/v1/wmts/1.0.0/topo/default/webmercator/%1/%3/%2").arg(zoom).arg(pos.X()).arg(pos.Y());
             }
             break;
-        case MapType::Statkart_Basemap:
+        case MapType::Svalbard:
             {
-                return QString("http://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=norgeskart_bakgrunn&zoom=%1&x=%2&y=%3").arg(zoom).arg(pos.X()).arg(pos.Y());
+                return QString("https://geodata.npolar.no/arcgis/rest/services/Basisdata/NP_Basiskart_Svalbard_WMTS_3857/MapServer/WMTS/tile/1.0.0/Basisdata_NP_Basiskart_Svalbard_WMTS_3857/default/default028mm/%1/%3/%2").arg(zoom).arg(pos.X()).arg(pos.Y());
             }
             break;
         case MapType::Eniro_Topo:
             {
-                return QString("http://map.eniro.com/geowebcache/service/tms1.0.0/map/%1/%2/%3.png").arg(zoom).arg(pos.X()).arg((1<<zoom)-1-pos.Y());
+                return QString("https://map.eniro.com/geowebcache/service/tms1.0.0/map/%1/%2/%3.png").arg(zoom).arg(pos.X()).arg((1<<zoom)-1-pos.Y());
             }
             break;
         case MapType::JapanMap:
diff --git a/src/ui/map/QGCMapToolBar.cc b/src/ui/map/QGCMapToolBar.cc
index 9f10ed3e3..4ff64ef83 100644
--- a/src/ui/map/QGCMapToolBar.cc
+++ b/src/ui/map/QGCMapToolBar.cc
@@ -35,8 +35,8 @@ static const struct {
     { "ArcGIS Terrain", MapType::ArcGIS_Terrain },
     { "ArcGIS World Topo", MapType::ArcGIS_WorldTopo },
     { "Statkart Topo", MapType::Statkart_Topo },
-    { "Statkart Basemap", MapType::Statkart_Basemap },
-    { "Eniro N,S,F,D,P", MapType::Eniro_Topo },
+    { "Svalbard", MapType::Svalbard },
+    { "Eniro N,S,F,D", MapType::Eniro_Topo },
     { "Japan Map", MapType::JapanMap },
 };