diff --git a/config/index.js b/config/index.js
index 4cbf464b5..f42b01444 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,9 +1,9 @@
 /* global process */
 
 module.exports = (() => {
-  const env = process.env.APPENV || "dev";
+  const env = process.env.REACT_APP_HOST_ENV || "dev";
 
-  console.info(`APPENV: "${env}"`);
+  console.info(`REACT_APP_HOST_ENV: "${env}"`);
 
   // for security reason don't let to require any arbitrary file defined in process.env
   if (["prod", "dev"].indexOf(env) < 0) {
diff --git a/webpack.config.js b/webpack.config.js
index 46de87289..3c33f677f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -119,7 +119,8 @@ module.exports = (webpackConfigEnv) => {
       new webpack.DefinePlugin({
         "process.env": {
           ..._.mapValues(config, (value) => JSON.stringify(value)),
-          APPENV: JSON.stringify(process.env.APPENV),
+          APPENV: JSON.stringify(process.env.REACT_APP_HOST_ENV),
+          REACT_APP_HOST_ENV: JSON.stringify(process.env.REACT_APP_HOST_ENV),
           APPMODE: JSON.stringify(process.env.APPMODE),
         },
       }),