diff --git a/interface/.env.development b/interface/.env.development
new file mode 100644
index 0000000..b21d356
--- /dev/null
+++ b/interface/.env.development
@@ -0,0 +1 @@
+REACT_APP_ENDPOINT_ROOT=http://developer.openobjects.com:8080/ds5-services/endpoint/esp8266/esp8266/esp8266/
\ No newline at end of file
diff --git a/interface/.env.production b/interface/.env.production
new file mode 100644
index 0000000..480ffc6
--- /dev/null
+++ b/interface/.env.production
@@ -0,0 +1 @@
+REACT_APP_ENDPOINT_ROOT=/rest/
\ No newline at end of file
diff --git a/interface/src/constants/Endpoints.js b/interface/src/constants/Endpoints.js
index 88999ea..efcd06e 100644
--- a/interface/src/constants/Endpoints.js
+++ b/interface/src/constants/Endpoints.js
@@ -1,13 +1,11 @@
-const ENDPOINT_HOST = "http://192.168.0.20";
-const ENDPOINT_PATH = "/rest";
-const ENDPOINT_PREFIX = ENDPOINT_HOST + ENDPOINT_PATH;
+const ENDPOINT_ROOT = process.env.REACT_APP_ENDPOINT_ROOT;
 
-export const NTP_STATUS_ENDPOINT = ENDPOINT_PREFIX + "/ntpStatus";
-export const NTP_SETTINGS_ENDPOINT = ENDPOINT_PREFIX + "/ntpSettings";
-export const AP_SETTINGS_ENDPOINT = ENDPOINT_PREFIX + "/apSettings";
-export const AP_STATUS_ENDPOINT = ENDPOINT_PREFIX + "/apStatus";
-export const SCAN_NETWORKS_ENDPOINT = ENDPOINT_PREFIX + "/scanNetworks";
-export const LIST_NETWORKS_ENDPOINT = ENDPOINT_PREFIX + "/listNetworks";
-export const WIFI_SETTINGS_ENDPOINT = ENDPOINT_PREFIX + "/wifiSettings";
-export const WIFI_STATUS_ENDPOINT = ENDPOINT_PREFIX + "/wifiStatus";
-export const OTA_SETTINGS_ENDPOINT = ENDPOINT_PREFIX + "/otaSettings";
+export const NTP_STATUS_ENDPOINT = ENDPOINT_ROOT + "ntpStatus";
+export const NTP_SETTINGS_ENDPOINT = ENDPOINT_ROOT + "ntpSettings";
+export const AP_SETTINGS_ENDPOINT = ENDPOINT_ROOT + "apSettings";
+export const AP_STATUS_ENDPOINT = ENDPOINT_ROOT + "apStatus";
+export const SCAN_NETWORKS_ENDPOINT = ENDPOINT_ROOT + "scanNetworks";
+export const LIST_NETWORKS_ENDPOINT = ENDPOINT_ROOT + "listNetworks";
+export const WIFI_SETTINGS_ENDPOINT = ENDPOINT_ROOT + "wifiSettings";
+export const WIFI_STATUS_ENDPOINT = ENDPOINT_ROOT + "wifiStatus";
+export const OTA_SETTINGS_ENDPOINT = ENDPOINT_ROOT + "otaSettings";