diff --git a/.github/workflows/aws-hosting-merge-deploy-newm-mobile-wallet-connector.yml b/.github/workflows/aws-hosting-merge-deploy-newm-mobile-wallet-connector.yml
index da5bdf11..4e0bfe20 100644
--- a/.github/workflows/aws-hosting-merge-deploy-newm-mobile-wallet-connector.yml
+++ b/.github/workflows/aws-hosting-merge-deploy-newm-mobile-wallet-connector.yml
@@ -39,4 +39,4 @@ jobs:
         run: |
           npm install --prefix .github/workflows/cdk
           sed -i 's|const nextConfig = .*|const nextConfig = { basePath: "/wallet-connect", |' apps/mobile-wallet-connector/next.config.js
-          APPNAME=mobile-wallet-connector APPID=MobileWalletConnector QUALIFIER=Garage NEXT_PUBLIC_ENV=staging NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING=${{ secrets.RECAPTCHA_SITE_KEY_STAGING }} npm run --prefix .github/workflows/cdk cdk:deploy deploy -- --require-approval never
+          APPNAME=mobile-wallet-connector APPID=MobileWalletConnector QUALIFIER=Garage NEXT_PUBLIC_ENV=production NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING=${{ secrets.RECAPTCHA_SITE_KEY_STAGING }} npm run --prefix .github/workflows/cdk cdk:deploy deploy -- --require-approval never
diff --git a/.github/workflows/aws-hosting-merge-deploy-newm-tools.yml b/.github/workflows/aws-hosting-merge-deploy-newm-tools.yml
index a321590b..9eb844b6 100644
--- a/.github/workflows/aws-hosting-merge-deploy-newm-tools.yml
+++ b/.github/workflows/aws-hosting-merge-deploy-newm-tools.yml
@@ -17,15 +17,6 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v3
-      - run: npm install
-      - run: npx nx build tools
-        env:
-          NEXT_PUBLIC_APPLE_CLIENT_ID: ${{ secrets.APPLE_CLIENT_ID }}
-          NEXT_PUBLIC_GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
-          NEXT_PUBLIC_GA_STUDIO_ID: ${{ secrets.GA_STUDIO_ID }}
-          NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING: ${{ secrets.RECAPTCHA_SITE_KEY_STAGING }}
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          NEXT_PUBLIC_ENV: staging
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -46,4 +37,4 @@ jobs:
       - name: Deploy to Lambda Function
         run: |
           npm install --prefix .github/workflows/cdk
-          APPNAME=tools APPID=Tools QUALIFIER=Garage NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING=${{ secrets.RECAPTCHA_SITE_KEY_STAGING }} npm run --prefix .github/workflows/cdk cdk:deploy deploy -- --require-approval never
+          APPNAME=tools APPID=Tools QUALIFIER=Garage NEXT_PUBLIC_ENV=production NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING=${{ secrets.RECAPTCHA_SITE_KEY_STAGING }} npm run --prefix .github/workflows/cdk cdk:deploy deploy -- --require-approval never
diff --git a/.github/workflows/aws-hosting-pull-request-newm-tools.yml b/.github/workflows/aws-hosting-pull-request-newm-tools.yml
index c0eeb74e..d3cc156b 100644
--- a/.github/workflows/aws-hosting-pull-request-newm-tools.yml
+++ b/.github/workflows/aws-hosting-pull-request-newm-tools.yml
@@ -15,15 +15,6 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v3
-      - run: npm install
-      - run: npx nx build tools
-        env:
-          NEXT_PUBLIC_APPLE_CLIENT_ID: ${{ secrets.APPLE_CLIENT_ID }}
-          NEXT_PUBLIC_GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
-          NEXT_PUBLIC_GA_STUDIO_ID: ${{ secrets.GA_STUDIO_ID }}
-          NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING: ${{ secrets.RECAPTCHA_SITE_KEY_STAGING }}
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          NEXT_PUBLIC_ENV: staging
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -44,7 +35,7 @@ jobs:
       - name: Deploy to Lambda Function
         run: |
           npm install --prefix .github/workflows/cdk
-          APPNAME=tools QUALIFIER=${{ github.event.pull_request.number }} npm run --prefix .github/workflows/cdk cdk:preview deploy -- --require-approval never
+          APPNAME=tools QUALIFIER=${{ github.event.pull_request.number }} NEXT_PUBLIC_ENV=staging NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING=${{ secrets.RECAPTCHA_SITE_KEY_STAGING }} npm run --prefix .github/workflows/cdk cdk:preview deploy -- --require-approval never
 
       - name: Get preview url
         id: previewurl
diff --git a/.github/workflows/cdk/bin/deploy.ts b/.github/workflows/cdk/bin/deploy.ts
index 50404200..41788ab2 100644
--- a/.github/workflows/cdk/bin/deploy.ts
+++ b/.github/workflows/cdk/bin/deploy.ts
@@ -11,6 +11,7 @@ const appName = process.env.APPNAME || "APPNAME";
 const appId = process.env.APPID || "APPID";
 const qualifier = process.env.QUALIFIER || "UNDEFINED";
 const recaptchaKey = process.env.NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING || "";
+const appEnv = process.env.NEXT_PUBLIC_ENV || "";
 const rootDir = path.resolve(__dirname, "..", "..", "..", "..");
 
 class WebDeployStack extends cdk.Stack {
@@ -24,6 +25,7 @@ class WebDeployStack extends cdk.Stack {
         code: lambda.DockerImageCode.fromImageAsset(rootDir, {
           buildArgs: {
             NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING: recaptchaKey,
+            NEXT_PUBLIC_ENV: appEnv,
           },
           file: path.join("apps", appName, "Dockerfile"),
         }),
diff --git a/.github/workflows/cdk/bin/preview.ts b/.github/workflows/cdk/bin/preview.ts
index 65caa5ef..c02d2ddb 100644
--- a/.github/workflows/cdk/bin/preview.ts
+++ b/.github/workflows/cdk/bin/preview.ts
@@ -9,6 +9,7 @@ const appName = process.env.APPNAME || "APPNAME";
 const appNameAbbr = appName.replace(/-/g, "");
 const qualifier = process.env.QUALIFIER || "UNDEFINED";
 const recaptchaKey = process.env.NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING || "";
+const appEnv = process.env.NEXT_PUBLIC_ENV || "";
 const rootDir = path.resolve(__dirname, "..", "..", "..", "..");
 
 class WebPreviewStack extends cdk.Stack {
@@ -21,6 +22,7 @@ class WebPreviewStack extends cdk.Stack {
       {
         code: lambda.DockerImageCode.fromImageAsset(rootDir, {
           buildArgs: {
+            NEXT_PUBLIC_ENV: appEnv,
             NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING: recaptchaKey,
           },
           file: path.join("apps", appName, "Dockerfile"),
diff --git a/apps/tools/Dockerfile b/apps/tools/Dockerfile
index b524b151..09c7dee3 100644
--- a/apps/tools/Dockerfile
+++ b/apps/tools/Dockerfile
@@ -23,6 +23,9 @@ WORKDIR /usr/src/app
 COPY --chown=node:node  --from=deps /usr/src/app/node_modules ./node_modules
 COPY --chown=node:node ./ ./
 
+ARG NEXT_PUBLIC_ENV
+ARG NEXT_PUBLIC_RECAPTCHA_SITE_KEY_STAGING
+
 # Build the production app
 RUN npx nx build tools