diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1df58a3..47c370d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,6 @@ jobs:
     - image: cimg/aws:2023.01
     environment:
       CODEARTIFACT_ENV: PROD
-      ECR_ENV: PROD
       SERVICE_NAME: "domain-challenge"
       OUT_DIR: "buildscripts"
     steps:
@@ -28,8 +27,14 @@ jobs:
           rm -f awsenvconf
           docker build -t ${SERVICE_NAME}:${CIRCLE_SHA1} .
     - run:
-        name: "Set AWS environment variables"
+        name: "Set ECR_ENV based on event type"
         command: |
+          if [ "${CIRCLE_PULL_REQUEST}" != "" ]; then
+            export ECR_ENV="DEV"
+          else
+            export ECR_ENV="PROD"
+          fi
+          echo "Using ECR Environment: ${ECR_ENV}"
           ./awsconfiguration.sh ${ECR_ENV}
     - run:
         name: "Publish docker image"
@@ -45,7 +50,3 @@ workflows:
     jobs:
     - "publish-image":
         context: "org-global"
-        filters:
-          branches:
-            only:
-            - main
diff --git a/Dockerfile b/Dockerfile
index 8ca335c..20d4fd8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,12 +30,12 @@ ENV GRPC_NOSQL_SERVER_PORT=50052
 ENV REGISTRATION_PHASE_ID=""
 ENV SUBMISSION_PHASE_ID=""
 ENV CHECKPOINT_SUBMISSION_PHASE_ID=""
+ENV TOPCODER_API_URL=""
 ENV AUTH_SECRET=""
 ENV AUTH0_AUDIENCE=""
 ENV AUTH0_CLIENT_ID=""
 ENV AUTH0_CLIENT_SECRET=""
 ENV AUTH0_PROXY_SERVER_URL=""
 ENV AUTH0_URL=""
-ENV TOPCODER_API_URL=""
 
 CMD ["server.js"]