diff --git a/app/configurations/config.default.js b/app/configurations/config.default.js
index 9153fb4bc8..59e2b6eb3b 100644
--- a/app/configurations/config.default.js
+++ b/app/configurations/config.default.js
@@ -6,8 +6,7 @@ const CONFIG = process.env.CONFIG || 'default';
 const API_URL = process.env.API_URL || 'https://dev-api.digitransit.fi';
 const GEOCODING_BASE_URL =
   process.env.GEOCODING_BASE_URL || `${API_URL}/geocoding/v1`;
-const MAP_URL =
-  process.env.MAP_URL || 'https://digitransit-dev-cdn-origin.azureedge.net';
+const MAP_URL = process.env.MAP_URL || 'https://https://dev-cdn.digitransit.fi';
 const MAP_VERSION = process.env.MAP_VERSION || 'v3';
 const POI_MAP_PREFIX = `${MAP_URL}/map/v3/finland`;
 const OTP_URL = process.env.OTP_URL || `${API_URL}/routing/v2/finland/`;
diff --git a/app/configurations/config.hsl.js b/app/configurations/config.hsl.js
index dced04e5f7..a903052767 100644
--- a/app/configurations/config.hsl.js
+++ b/app/configurations/config.hsl.js
@@ -4,8 +4,7 @@ import { BIKEAVL_WITHMAX } from '../util/vehicleRentalUtils';
 const CONFIG = 'hsl';
 const API_URL = process.env.API_URL || 'https://dev-api.digitransit.fi';
 const OTP_URL = process.env.OTP_URL || `${API_URL}/routing/v2/hsl/`;
-const MAP_URL =
-  process.env.MAP_URL || 'https://digitransit-dev-cdn-origin.azureedge.net';
+const MAP_URL = process.env.MAP_URL || 'https://https://dev-cdn.digitransit.fi';
 const POI_MAP_PREFIX = `${MAP_URL}/map/v3/hsl`;
 const APP_DESCRIPTION = 'Helsingin seudun liikenteen Reittiopas.';
 const HSLTimetables = require('./timetableConfigUtils').default.HSL;
diff --git a/app/configurations/config.kela.js b/app/configurations/config.kela.js
index 9ef8429630..634f1f0873 100644
--- a/app/configurations/config.kela.js
+++ b/app/configurations/config.kela.js
@@ -7,8 +7,7 @@ const APP_TITLE = 'Reittiopas';
 const APP_DESCRIPTION = 'Digitransit-reittiopas';
 const API_URL = process.env.API_URL || 'https://dev-api.digitransit.fi';
 const OTP_URL = process.env.OTP_URL || `${API_URL}/routing/v2-kela/kela/`;
-const MAP_URL =
-  process.env.MAP_URL || 'https://digitransit-dev-cdn-origin.azureedge.net';
+const MAP_URL = process.env.MAP_URL || 'https://https://dev-cdn.digitransit.fi';
 const POI_MAP_PREFIX = `${MAP_URL}/map/v3-kela/kela`;
 
 export default {
diff --git a/app/configurations/config.matka.js b/app/configurations/config.matka.js
index 37b6f37309..c6fed90746 100644
--- a/app/configurations/config.matka.js
+++ b/app/configurations/config.matka.js
@@ -22,7 +22,7 @@ export default {
   CONFIG,
   OTPTimeout: process.env.OTP_TIMEOUT || 30000,
   URL: {
-    FONT: 'https://digitransit-prod-cdn-origin.azureedge.net/matka-fonts/roboto/roboto+montserrat.css',
+    FONT: 'https://cdn.digitransit.fi/matka-fonts/roboto/roboto+montserrat.css',
   },
 
   mainMenu: {
diff --git a/app/configurations/config.varely.js b/app/configurations/config.varely.js
index db1be1294a..a3752fda0e 100644
--- a/app/configurations/config.varely.js
+++ b/app/configurations/config.varely.js
@@ -6,8 +6,7 @@ const API_URL = process.env.API_URL || 'https://dev-api.digitransit.fi';
 const APP_TITLE = 'Seutu+ reittiopas';
 const APP_DESCRIPTION = 'Varsinais-Suomen ELY-keskuksen reittiopas';
 const OTP_URL = process.env.OTP_URL || `${API_URL}/routing/v2/varely/`;
-const MAP_URL =
-  process.env.MAP_URL || 'https://digitransit-dev-cdn-origin.azureedge.net';
+const MAP_URL = process.env.MAP_URL || 'https://https://dev-cdn.digitransit.fi';
 const POI_MAP_PREFIX = `${MAP_URL}/map/v3/varely`;
 
 const walttiConfig = require('./config.waltti').default;
diff --git a/app/configurations/config.waltti.js b/app/configurations/config.waltti.js
index 47f07781d2..9da6af522b 100644
--- a/app/configurations/config.waltti.js
+++ b/app/configurations/config.waltti.js
@@ -1,7 +1,6 @@
 const API_URL = process.env.API_URL || 'https://dev-api.digitransit.fi';
 const OTP_URL = process.env.OTP_URL || `${API_URL}/routing/v2/waltti/`;
-const MAP_URL =
-  process.env.MAP_URL || 'https://digitransit-dev-cdn-origin.azureedge.net';
+const MAP_URL = process.env.MAP_URL || 'https://https://dev-cdn.digitransit.fi';
 const POI_MAP_PREFIX = `${MAP_URL}/map/v3/waltti`;
 const APP_DESCRIPTION = 'Digitransit-reittiopas';
 const YEAR = 1900 + new Date().getYear();