diff --git a/stack-orchestrator/compose/docker-compose-testnet-onboarding-app.yml b/stack-orchestrator/compose/docker-compose-testnet-onboarding-app.yml
index a5646bb..8ef20ea 100644
--- a/stack-orchestrator/compose/docker-compose-testnet-onboarding-app.yml
+++ b/stack-orchestrator/compose/docker-compose-testnet-onboarding-app.yml
@@ -12,8 +12,7 @@ services:
       CERC_LACONICD_DENOM: ${CERC_LACONICD_DENOM:-photon}
       CERC_FAUCET_ENDPOINT: ${CERC_FAUCET_ENDPOINT:-http://localhost:4000}
       CERC_WALLET_META_URL: ${CERC_WALLET_META_URL:-http://localhost:3000}
-    working_dir: /scripts
-    command: ["bash", "onboarding-app-start.sh"]
+    command: ["bash", "/scripts/onboarding-app-start.sh"]
     volumes:
       - ../config/app/onboarding-app-start.sh:/scripts/onboarding-app-start.sh
     ports:
diff --git a/stack-orchestrator/config/app/onboarding-app-start.sh b/stack-orchestrator/config/app/onboarding-app-start.sh
index b9d8011..09ff96c 100644
--- a/stack-orchestrator/config/app/onboarding-app-start.sh
+++ b/stack-orchestrator/config/app/onboarding-app-start.sh
@@ -15,14 +15,14 @@ echo "CERC_FAUCET_ENDPOINT: ${CERC_FAUCET_ENDPOINT}"
 echo "CERC_WALLET_META_URL: ${CERC_WALLET_META_URL}"
 
 # Build with required env
-REACT_APP_WALLET_CONNECT_ID= $WALLET_CONNECT_ID \
+REACT_APP_WALLET_CONNECT_ID=$WALLET_CONNECT_ID \
 REACT_APP_ETHEREUM_MAINNET_CHAIN_ID=1 \
-REACT_APP_LACONICD_CHAIN_ID=$LACONICD_CHAIN_ID \
-REACT_APP_REGISTRY_GQL_ENDPOINT=$REGISTRY_GQL_ENDPOINT \
-REACT_APP_LACONICD_RPC_ENDPOINT=$LACONICD_RPC_ENDPOINT \
-REACT_APP_LACONICD_DENOM=$LACONICD_DENOM \
-REACT_APP_FAUCET_ENDPOINT=$FAUCET_ENDPOINT \
-REACT_APP_WALLET_META_URL=$WALLET_META_URL \
+REACT_APP_LACONICD_CHAIN_ID=$CERC_LACONICD_CHAIN_ID \
+REACT_APP_REGISTRY_GQL_ENDPOINT=$CERC_REGISTRY_GQL_ENDPOINT \
+REACT_APP_LACONICD_RPC_ENDPOINT=$CERC_LACONICD_RPC_ENDPOINT \
+REACT_APP_LACONICD_DENOM=$CERC_LACONICD_DENOM \
+REACT_APP_FAUCET_ENDPOINT=$CERC_FAUCET_ENDPOINT \
+REACT_APP_WALLET_META_URL=$CERC_WALLET_META_URL \
 yarn build
 
 http-server -p 80 /app/build
diff --git a/stack-orchestrator/container-build/cerc-testnet-onboarding-app/build.sh b/stack-orchestrator/container-build/cerc-testnet-onboarding-app/build.sh
new file mode 100755
index 0000000..bce1018
--- /dev/null
+++ b/stack-orchestrator/container-build/cerc-testnet-onboarding-app/build.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# Build cerc/testnet-onboarding-app
+
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
+# See: https://stackoverflow.com/a/246128/1701505
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+CERC_NPM_REGISTRY_URL="https://git.vdb.to/api/packages/cerc-io/npm/"
+
+docker build -t cerc/testnet-onboarding-app:local  ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/testnet-onboarding-app