diff --git a/app/services/browser-cache.js b/app/services/browser-cache.js
index f6dc63a..33cac37 100644
--- a/app/services/browser-cache.js
+++ b/app/services/browser-cache.js
@@ -3,7 +3,12 @@ import * as localforage from 'localforage';
 import config from 'kredits-web/config/environment';
 
 function createStore(name) {
-  const networkName = config.web3RequiredNetwork || 'custom';
+  let networkName;
+  if (config.web3RequiredNetworkName) {
+    networkName = config.web3RequiredNetworkName.toLocaleLowerCase().replace(' ', '-');
+  } else {
+    networkName = 'custom';
+  }
   return localforage.createInstance({ name: `kredits:${networkName}:${name}` });
 }
 
diff --git a/app/services/kredits.js b/app/services/kredits.js
index c402ce4..3d806ee 100644
--- a/app/services/kredits.js
+++ b/app/services/kredits.js
@@ -77,7 +77,7 @@ export default Service.extend({
         ethProvider = new ethers.providers.Web3Provider(web3Provider);
 
         const network = await ethProvider.getNetwork();
-        if (isPresent(config.web3RequiredNetwork) &&
+        if (isPresent(config.web3RequiredChainId) &&
             network.chainId !== config.web3RequiredChainId) {
           return instantiateWithoutAccount();
         }
diff --git a/config/environment.js b/config/environment.js
index 56698eb..dcd354d 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -82,13 +82,7 @@ module.exports = function(environment) {
 
   if (process.env.WEB3_PROVIDER_URL) {
     ENV.web3ProviderUrl = process.env.WEB3_PROVIDER_URL;
-    ENV.web3RequiredNetwork = null;
-  }
-  if (process.env.KREDITS_DAO_ADDRESS) {
-    ENV.kreditsKernelAddress = process.env.KREDITS_DAO_ADDRESS;
-  }
-  if (process.env.KREDITS_APM_DOMAIN) {
-    ENV.kreditsApmDomain = process.env.KREDITS_APM_DOMAIN;
+    ENV.web3RequiredChainId = null;
   }
 
   return ENV;