diff --git a/stack/stack-orchestrator/config/app/run.sh b/stack/stack-orchestrator/config/app/run.sh
index a5c3ed1..be6b210 100755
--- a/stack/stack-orchestrator/config/app/run.sh
+++ b/stack/stack-orchestrator/config/app/run.sh
@@ -14,13 +14,15 @@ echo "CERC_ZENITHD_RPC_URL: ${CERC_ZENITHD_RPC_URL}"
 echo "CERC_ALLOWED_URLS: ${CERC_ALLOWED_URLS}"
 
 # Build with required env
-REACT_APP_WALLET_CONNECT_PROJECT_ID=$WALLET_CONNECT_ID \
-REACT_APP_DEFAULT_GAS_PRICE=$CERC_DEFAULT_GAS_PRICE \
-REACT_APP_GAS_ADJUSTMENT=$CERC_GAS_ADJUSTMENT \
-REACT_APP_LACONICD_RPC_URL=$CERC_LACONICD_RPC_URL \
-REACT_APP_ZENITHD_RPC_URL=$CERC_ZENITHD_RPC_URL \
-REACT_APP_ALLOWED_URLS=$CERC_ALLOWED_URLS \
-yarn build
+export REACT_APP_WALLET_CONNECT_PROJECT_ID=$WALLET_CONNECT_ID
+export REACT_APP_DEFAULT_GAS_PRICE=$CERC_DEFAULT_GAS_PRICE
+export REACT_APP_GAS_ADJUSTMENT=$CERC_GAS_ADJUSTMENT
+export REACT_APP_LACONICD_RPC_URL=$CERC_LACONICD_RPC_URL
+export REACT_APP_ZENITHD_RPC_URL=$CERC_ZENITHD_RPC_URL
+export REACT_APP_ALLOWED_URLS=$CERC_ALLOWED_URLS
+
+# Set env variables in build
+yarn set-env
 
 # Define the directory and file path
 FILE_PATH="/app/build/.well-known/walletconnect.txt"
diff --git a/stack/stack-orchestrator/container-build/cerc-laconic-wallet-web/Dockerfile b/stack/stack-orchestrator/container-build/cerc-laconic-wallet-web/Dockerfile
index f186f45..bd9da3b 100644
--- a/stack/stack-orchestrator/container-build/cerc-laconic-wallet-web/Dockerfile
+++ b/stack/stack-orchestrator/container-build/cerc-laconic-wallet-web/Dockerfile
@@ -37,7 +37,7 @@ RUN yarn global add serve
 
 WORKDIR /app
 COPY . .
-RUN yarn install
+RUN yarn install && yarn build
 
 # Expose port for http
 EXPOSE 80