diff --git a/.github/workflows/web-develop.yml b/.github/workflows/web-develop.yml
index d9dccedc6..e963bd593 100644
--- a/.github/workflows/web-develop.yml
+++ b/.github/workflows/web-develop.yml
@@ -66,8 +66,8 @@ jobs:
 
       - name: Setup Environment Variables
         run: |
-          echo "NEXT_PUBLIC_API_URL=https://citycatalyst-test.openearth.dev" >> .env.local
-          echo "NEXT_PUBLIC_OPENCLIMATE_API_URL=https://openclimate-test.openearth.dev" >> .env.local
+          echo "NEXT_PUBLIC_API_URL=https://citycatalyst.openearth.dev" >> .env.local
+          echo "NEXT_PUBLIC_OPENCLIMATE_API_URL=https://openclimate.openearth.dev" >> .env.local
 
       - name: Run NextJS build
         run: npm run build
@@ -122,8 +122,8 @@ jobs:
           IMAGE: ghcr.io/open-earth-foundation/citycatalyst
         run: |
           docker build \
-          --build-arg NEXT_PUBLIC_API_URL=https://citycatalyst-test.openearth.dev \
-          --build-arg NEXT_PUBLIC_OPENCLIMATE_API_URL=https://openclimate-test.openearth.dev \
+          --build-arg NEXT_PUBLIC_API_URL=https://citycatalyst.openearth.dev \
+          --build-arg NEXT_PUBLIC_OPENCLIMATE_API_URL=https://openclimate.openearth.dev \
           -t $IMAGE:$VERSION app
           docker tag $IMAGE:$VERSION $IMAGE:latest
           docker push $IMAGE:$VERSION
diff --git a/.github/workflows/web-test.yml b/.github/workflows/web-test.yml
index 64fcddbf2..cb3761e14 100644
--- a/.github/workflows/web-test.yml
+++ b/.github/workflows/web-test.yml
@@ -9,7 +9,7 @@ on:
       - k8s/test/cc-test-web-deploy.yml
       - k8s/test/cc-test/web.yml
       - .github/workflows/web-test.yml
-    branches: ["main"]
+    branches: [ "main" ]
 
 jobs:
   runTests:
@@ -45,6 +45,11 @@ jobs:
           npm run db:migrate
           npm run db:seed
 
+      - name: Setup Environment Variables
+        run: |
+          echo "NEXT_PUBLIC_API_URL=https://citycatalyst-test.openearth.dev" >> .env.local
+          echo "NEXT_PUBLIC_OPENCLIMATE_API_URL=https://openclimate.openearth.dev" >> .env.local
+
       - name: Run NextJS build
         run: npm run build
 
@@ -93,7 +98,10 @@ jobs:
           VERSION: ${{ github.sha }}
           IMAGE: ghcr.io/open-earth-foundation/citycatalyst
         run: |
-          docker build -t $IMAGE:$VERSION app
+          docker build \
+          --build-arg NEXT_PUBLIC_API_URL=https://citycatalyst-test.openearth.dev \
+          --build-arg NEXT_PUBLIC_OPENCLIMATE_API_URL=https://openclimate.openearth.dev \
+          -t $IMAGE:$VERSION app
           docker tag $IMAGE:$VERSION $IMAGE:main
           docker push $IMAGE:$VERSION
           docker push $IMAGE:main