diff --git a/client/Dockerfile b/client/Dockerfile
index 41774e5..d101e33 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -15,33 +15,11 @@ WORKDIR /app/frontend
 
 RUN npm install -g npm serve
 RUN npm install
+RUN npm run build
 
 # Default ENV values
-# src/config/config.ts
-ENV SERVICE_SCHEME='http'
-ENV SERVICE_HOST='localhost'
-ENV SERVICE_PORT='4000'
-ENV NODE_SCHEME='http'
-ENV NODE_HOST='localhost'
-ENV NODE_PORT='8545'
-ENV AQUARIUS_SCHEME='http'
-ENV AQUARIUS_HOST='localhost'
-ENV AQUARIUS_PORT='5000'
-ENV BRIZO_SCHEME='http'
-ENV BRIZO_HOST='localhost'
-ENV BRIZO_PORT='8030'
-ENV BRIZO_ADDRESS='0x00bd138abd70e2f00903268f3db08f2d25677c9e'
-ENV PARITY_SCHEME='http'
-ENV PARITY_HOST='localhost'
-ENV PARITY_PORT='8545'
-ENV SECRET_STORE_SCHEME='http'
-ENV SECRET_STORE_HOST='localhost'
-ENV SECRET_STORE_PORT='12001'
-ENV FAUCET_SCHEME='http'
-ENV FAUCET_HOST='localhost'
-ENV FAUCET_PORT='3001'
-
 ENV LISTEN_ADDRESS='0.0.0.0'
 ENV LISTEN_PORT='3000'
 
 ENTRYPOINT ["/app/frontend/scripts/docker-entrypoint.sh"]
+
diff --git a/client/scripts/docker-entrypoint.sh b/client/scripts/docker-entrypoint.sh
index 700e873..36216ad 100755
--- a/client/scripts/docker-entrypoint.sh
+++ b/client/scripts/docker-entrypoint.sh
@@ -1,37 +1,11 @@
 #!/bin/sh
 
-SERVICE_SCHEME=${SERVICE_SCHEME:-http}
-SERVICE_HOST=${SERVICE_HOST:-localhost}
-SERVICE_PORT=${SERVICE_PORT:-8545}
-
-NODE_SCHEME=${NODE_SCHEME:-http}
-NODE_HOST=${NODE_HOST:-localhost}
-NODE_PORT=${NODE_PORT:-8545}
-AQUARIUS_SCHEME=${AQUARIUS_SCHEME:-http}
-AQUARIUS_HOST=${AQUARIUS_HOST:-localhost}
-AQUARIUS_PORT=${AQUARIUS_PORT:-5000}
-BRIZO_SCHEME=${BRIZO_SCHEME:-http}
-BRIZO_HOST=${BRIZO_HOST:-localhost}
-BRIZO_PORT=${BRIZO_PORT:-8030}
-BRIZO_PASSWORD=${BRIZO_PASSWORD:-0x00bd138abd70e2f00903268f3db08f2d25677c9e}
-PARITY_SCHEME=${PARITY_SCHEME:-http}
-PARITY_HOST=${PARITY_HOST:-localhost}
-PARITY_PORT=${PARITY_PORT:-8545}
-SECRET_STORE_SCHEME=${SECRET_STORE_SCHEME:-http}
-SECRET_STORE_HOST=${SECRET_STORE_HOST:-localhost}
-SECRET_STORE_PORT=${SECRET_STORE_PORT:-12001}
-
-FAUCET_SCHEME=${FAUCET_SCHEME:-http}
-FAUCET_HOST=${FAUCET_HOST:-localhost}
-FAUCET_PORT=${FAUCET_PORT:-443}
-
-envsubst < /app/frontend/src/config/config.ts.template > /app/frontend/src/config/config.ts
 if [ "${LOCAL_CONTRACTS}" = "true" ]; then
   echo "Waiting for contracts to be generated..."
   while [ ! -f "/app/frontend/node_modules/@oceanprotocol/keeper-contracts/artifacts/ready" ]; do
     sleep 2
   done
 fi
-echo "Starting Commons..."
 npm run build
+echo "Starting Commons..."
 serve -l tcp://"${LISTEN_ADDRESS}":"${LISTEN_PORT}" -s /app/frontend/build/
diff --git a/client/src/config/config.ts b/client/src/config/config.ts
index a3447fe..c372f4a 100644
--- a/client/src/config/config.ts
+++ b/client/src/config/config.ts
@@ -1,37 +1,37 @@
 //
 // commons-server connection
 //
-export const serviceScheme = 'http'
-export const serviceHost = 'localhost'
-export const servicePort = 4000
+export const serviceScheme = process.env.REACT_APP_SERVICE_SCHEME || 'http'
+export const serviceHost = process.env.REACT_APP_SERVICE_HOST || 'localhost'
+export const servicePort = process.env.REACT_APP_SERVICE_PORT || 4000
 
 //
 // OCEAN REMOTE CONNECTIONS
 //
-export const nodeScheme = 'https'
-export const nodeHost = 'nile.dev-ocean.com'
-export const nodePort = 443
+export const nodeScheme = process.env.REACT_APP_NODE_SCHEME || 'https'
+export const nodeHost = process.env.REACT_APP_NODE_HOST || 'nile.dev-ocean.com'
+export const nodePort = process.env.REACT_APP_NODE_PORT || 443
 
-export const aquariusScheme = 'https'
-export const aquariusHost = 'nginx-aquarius.dev-ocean.com'
-export const aquariusPort = 443
+export const aquariusScheme = process.env.REACT_APP_AQUARIUS_SCHEME || 'https'
+export const aquariusHost = process.env.REACT_APP_AQUARIUS_HOST || 'nginx-aquarius.dev-ocean.com'
+export const aquariusPort = process.env.REACT_APP_AQUARIUS_PORT || 443
 
-export const brizoScheme = 'https'
-export const brizoHost = 'nginx-brizo.dev-ocean.com'
-export const brizoPort = 443
-export const brizoAddress = '0x376817c638d2a04f475a73af37f7b51a2862d567'
+export const brizoScheme = process.env.REACT_APP_BRIZO_SCHEME || 'https'
+export const brizoHost = process.env.REACT_APP_BRIZO_HOST || 'nginx-brizo.dev-ocean.com'
+export const brizoPort = process.env.REACT_APP_BRIZO_PORT || 443
+export const brizoAddress = process.env.REACT_APP_BRIZO_ADDRESS || '0x376817c638d2a04f475a73af37f7b51a2862d567'
 
-export const parityScheme = 'https'
-export const parityHost = 'nile.dev-ocean.com'
-export const parityPort = 443
+export const parityScheme = process.env.REACT_APP_PARITY_SCHEME || 'https'
+export const parityHost = process.env.REACT_APP_PARITY_HOST || 'nile.dev-ocean.com'
+export const parityPort = process.env.REACT_APP_PARITY_PORT || 443
 
-export const secretStoreScheme = 'https'
-export const secretStoreHost = 'secret-store.dev-ocean.com'
-export const secretStorePort = 443
+export const secretStoreScheme = process.env.REACT_APP_SECRET_STORE_SCHEME || 'https'
+export const secretStoreHost = process.env.REACT_APP_SECRET_STORE_HOST || 'secret-store.dev-ocean.com'
+export const secretStorePort = process.env.REACT_APP_SECRET_STORE_PORT || 443
 
-export const faucetScheme = 'https'
-export const faucetHost = 'faucet.nile.dev-ocean.com'
-export const faucetPort = 443
+export const faucetScheme = process.env.REACT_APP_FAUCET_SCHEME || 'https'
+export const faucetHost = process.env.REACT_APP_FAUCET_HOST || 'faucet.nile.dev-ocean.com'
+export const faucetPort = process.env.REACT_APP_FAUCET_PORT || 443
 
 //
 // OCEAN LOCAL CONNECTIONS
@@ -65,3 +65,4 @@ export const faucetPort = 443
 // export const faucetPort = 3001
 
 export const verbose = true
+
diff --git a/client/src/config/config.ts.template b/client/src/config/config.ts.template
deleted file mode 100644
index 120aad8..0000000
--- a/client/src/config/config.ts.template
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// commons-server connection
-//
-export const serviceScheme = '${SERVICE_SCHEME}'
-export const serviceHost = '${SERVICE_HOST}'
-export const servicePort = '${SERVICE_PORT}'
-
-//
-// OCEAN REMOTE CONNECTIONS
-//
-export const nodeScheme = '${NODE_SCHEME}'
-export const nodeHost = '${NODE_HOST}'
-export const nodePort = '${NODE_PORT}'
-
-export const aquariusScheme = '${AQUARIUS_SCHEME}'
-export const aquariusHost = '${AQUARIUS_HOST}'
-export const aquariusPort = '${AQUARIUS_PORT}'
-
-export const brizoScheme = '${BRIZO_SCHEME}'
-export const brizoHost = '${BRIZO_HOST}'
-export const brizoPort = '${BRIZO_ADDRESS}'
-export const brizoAddress = '${BRIZO_ADDRESS}'
-
-export const parityScheme = '${PARITY_SCHEME}'
-export const parityHost = '${PARITY_HOST}'
-export const parityPort = '${PARITY_PORT}'
-
-export const secretStoreScheme = '${SECRET_STORE_SCHEME}'
-export const secretStoreHost = '${SECRET_STORE_HOST}'
-export const secretStorePort = '${SECRET_STORE_PORT}'
-
-export const faucetScheme = '${FAUCET_SCHEME}'
-export const faucetHost = '${FAUCET_HOST}'
-export const faucetPort = '${FAUCET_PORT}'
-
-export const verbose = true
diff --git a/docker-compose.yml b/docker-compose.yml
index b9296b3..14e4cea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,4 +21,4 @@ services:
       dockerfile: ./Dockerfile
     ports:
       - 4000:4000
-    command: npm run start
+
diff --git a/server/Dockerfile b/server/Dockerfile
index 56b621f..aae8883 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -8,3 +8,6 @@ COPY . .
 RUN npm install
 
 RUN npm run build
+
+ENTRYPOINT ["npm", "run", "start"]
+