diff --git a/docs/getting-started/building-from-source.md b/docs/getting-started/building-from-source.md
index 32d9f4f7c..5d7b1b273 100644
--- a/docs/getting-started/building-from-source.md
+++ b/docs/getting-started/building-from-source.md
@@ -32,7 +32,7 @@ The application runs at port `4200` by default, and should automatically open in
 You might need to set some environment variables to be able to run the local dev server. In the project's root folder, create a `.env` file (this is gitignored) with the following data:
 
 ```bash
-API_HOST_CONTENT="http://your-url-here"
+API_CONTENT_HOST="http://your-url-here"
 ```
 
 ## Proxy settings
diff --git a/protractor.conf.js b/protractor.conf.js
index e2f5ffcf1..983dbf332 100755
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -15,7 +15,8 @@ const BROWSER_RUN = process.env.BROWSER_RUN;
 const width = 1366;
 const height = 768;
 
-const API_HOST = process.env.API_HOST || 'http://localhost:8080';
+const API_CONTENT_HOST =
+  process.env.API_CONTENT_HOST || 'http://localhost:8080';
 
 function rmDir(dirPath) {
   try {
@@ -33,7 +34,7 @@ function rmDir(dirPath) {
 }
 
 const appConfig = {
-  hostEcm: API_HOST,
+  hostEcm: API_CONTENT_HOST,
   providers: 'ECM',
   authType: 'BASIC'
 };
diff --git a/scripts/app-config-replace.js b/scripts/app-config-replace.js
index ab83e408f..e755cbd30 100755
--- a/scripts/app-config-replace.js
+++ b/scripts/app-config-replace.js
@@ -4,16 +4,16 @@ const program = require('commander');
 require('dotenv').config({ path: process.env.ENV_FILE });
 const fs = require('fs');
 
-const API_HOST = process.env.API_HOST || 'api';
+const API_CONTENT_HOST = process.env.API_CONTENT_HOST || 'api';
 const OAUTH_HOST = process.env.OAUTH_HOST || 'keycloak';
 
 const options = {
   apiHost: {
     flags: '-a, --api-host',
-    description: "set apiHost's and ecmHost's value with API_HOST",
+    description: "set apiHost's and ecmHost's value with API_CONTENT_HOST",
     set: appConfig => {
-      appConfig.ecmHost = API_HOST;
-      appConfig.aosHost = API_HOST + '/alfresco/aos';
+      appConfig.ecmHost = API_CONTENT_HOST;
+      appConfig.aosHost = API_CONTENT_HOST + '/alfresco/aos';
     }
   },
   oauthHost: {
diff --git a/src/proxy.conf.js b/src/proxy.conf.js
index f0aaf43ae..4ae5c706a 100644
--- a/src/proxy.conf.js
+++ b/src/proxy.conf.js
@@ -1,10 +1,10 @@
 require('dotenv').config();
 
-const API_HOST_CONTENT = process.env.API_HOST_CONTENT || 'http://0.0.0.0:8080';
+const API_CONTENT_HOST = process.env.API_CONTENT_HOST || 'http://0.0.0.0:8080';
 
 module.exports = {
   '/alfresco': {
-    target: API_HOST_CONTENT,
+    target: API_CONTENT_HOST,
     secure: false,
     changeOrigin: true,
     // workaround for REPO-2260
@@ -16,7 +16,7 @@ module.exports = {
     }
   },
   '/auth': {
-    target: API_HOST_CONTENT,
+    target: API_CONTENT_HOST,
     secure: false,
     changeOrigin: true
   }