diff --git a/src/api/index.js b/src/api/index.js
index fab893f1..77fdedbf 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -177,11 +177,11 @@ const CITIES_LOCATION = {
 };
 
 const API_TOKEN = process.env.NEXT_PUBLIC_APP_API_TOKEN;
-const API_BASE_URL = process.env.NEXT_PUBLIC_APP_API_BASE_UR;
+const API_BASE_URL = process.env.NEXT_PUBLIC_APP_API_BASE_URL;
 
 const API = {
   getAirData(city) {
-    return fetch(`${API_BASE_URL}/data/air/?city=${city}`, {
+    return fetch(`${API_BASE_URL}/data/stats/air/?city=${city}`, {
       headers: {
         Authorization: `Token ${API_TOKEN}`,
         "Content-Type": "application/json",
@@ -193,7 +193,7 @@ const API = {
       .toISOString()
       .substring(0, 10);
     return fetch(
-      `${API_BASE_URL}/data/air/?city=${city}&from=${fromDate}&interval=day&value_type=P2`,
+      `${API_BASE_URL}/data/stats/air/?city=${city}&from=${fromDate}&interval=day&value_type=P2`,
       {
         headers: {
           Authorization: `Token ${API_TOKEN}`,
diff --git a/src/components/Embeds/AirMap.js b/src/components/Embeds/AirMap.js
index ed095564..e707d56e 100644
--- a/src/components/Embeds/AirMap.js
+++ b/src/components/Embeds/AirMap.js
@@ -4,9 +4,11 @@ import React from "react";
 import { CITIES_LOCATION } from "api";
 
 function AirMap({ city }) {
+  const appMapUrl = process.env.NEXT_PUBLIC_APP_MAP_URL;
+
   return (
     <iframe
-      src={`https://v2.map.aq.sensors.africa/#${CITIES_LOCATION[city].zoom}/${CITIES_LOCATION[city].latitude}/${CITIES_LOCATION[city].longitude}`}
+      src={`${appMapUrl}/#${CITIES_LOCATION[city].zoom}/${CITIES_LOCATION[city].latitude}/${CITIES_LOCATION[city].longitude}`}
       name={`sensors-map-${CITIES_LOCATION[city].slug}`}
       title={`sensors.AFRICA | ${CITIES_LOCATION[city].name} Sensor Map`}
       scrolling="no"
diff --git a/src/components/SensorMap/index.js b/src/components/SensorMap/index.js
index fbb67939..1c658ce1 100644
--- a/src/components/SensorMap/index.js
+++ b/src/components/SensorMap/index.js
@@ -25,6 +25,8 @@ const useStyles = makeStyles((theme) => ({
 
 function Map({ zoom, latitude, longitude }) {
   const classes = useStyles();
+  const appMapUrl = process.env.NEXT_PUBLIC_APP_MAP_URL;
+
   return (
     <Grid
       container
@@ -43,7 +45,7 @@ function Map({ zoom, latitude, longitude }) {
       <Grid item xs={12}>
         <IframeComponent
           title="Map section"
-          src={`//v2.map.aq.sensors.africa/#${zoom}/${latitude}/${longitude}`}
+          src={`${appMapUrl}/#${zoom}/${latitude}/${longitude}`}
           height="500"
           width="100%"
           frameBorder="0"