diff --git a/.circleci/config.yml b/.circleci/config.yml
index 459ec723..4b315cea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -76,7 +76,7 @@ workflows:
             - test
           filters:
             branches:
-              only: ['dev']
+              only: ['dev', 'feature/auth0-proxy-server']
       - deployProd:
           requires:
             - test
diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
index 59814a2c..6620f43c 100644
--- a/config/custom-environment-variables.json
+++ b/config/custom-environment-variables.json
@@ -46,5 +46,6 @@
   "AUTH0_CLIENT_SECRET": "AUTH0_CLIENT_SECRET",
   "AUTH0_AUDIENCE": "AUTH0_AUDIENCE",
   "TOKEN_CACHE_TIME" : "TOKEN_CACHE_TIME",
-  "whitelistedOriginsForUserIdAuth": "WHITELISTED_ORIGINS_FOR_USERID_AUTH"
+  "whitelistedOriginsForUserIdAuth": "WHITELISTED_ORIGINS_FOR_USERID_AUTH",
+  "AUTH0_PROXY_SERVER_URL" : "AUTH0_PROXY_SERVER_URL"
 }
diff --git a/config/default.json b/config/default.json
index da84855b..a23a86e8 100644
--- a/config/default.json
+++ b/config/default.json
@@ -50,5 +50,6 @@
   "AUTH0_AUDIENCE": "",
   "AUTH0_URL": "",
   "TOKEN_CACHE_TIME": "",
-  "whitelistedOriginsForUserIdAuth": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]"
+  "whitelistedOriginsForUserIdAuth": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
+  "AUTH0_PROXY_SERVER_URL" : ""
 }
diff --git a/deploy.sh b/deploy.sh
index 87f6fd23..52a101f9 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -191,6 +191,10 @@ make_task_def(){
         {
           "name": "KAFKA_URL",
           "value": "%s"
+        },
+        {
+          "name": "AUTH0_PROXY_SERVER_URL",
+          "value": "%s"
         }
       ],
       "portMappings": [
@@ -246,9 +250,10 @@ make_task_def(){
   KAFKA_CLIENT_CERT_KEY=$(eval "echo \$${ENV}_KAFKA_CLIENT_CERT_KEY")
   KAFKA_GROUP_ID=$(eval "echo \$${ENV}_KAFKA_GROUP_ID")
   KAFKA_URL=$(eval "echo \$${ENV}_KAFKA_URL")
+  AUTH0_PROXY_SERVER_URL=$(eval "echo \$${ENV}_AUTH0_PROXY_SERVER_URL")
 
 
-  task_def=$(printf "$task_template" $1 $ACCOUNT_ID $ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $2 $3 $4 $NODE_ENV $ENABLE_FILE_UPLOAD $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $API_VERSION $AWS_REGION $AUTH_DOMAIN $AUTH_SECRET $VALID_ISSUERS $DB_MASTER_URL $MEMBER_SERVICE_ENDPOINT $IDENTITY_SERVICE_ENDPOINT $BUS_API_URL $MESSAGE_SERVICE_URL $SYSTEM_USER_CLIENT_ID $SYSTEM_USER_CLIENT_SECRET $PROJECTS_ES_URL $PROJECTS_ES_INDEX_NAME $RABBITMQ_URL $DIRECT_PROJECT_SERVICE_ENDPOINT $FILE_SERVICE_ENDPOINT $CONNECT_PROJECTS_URL $SEGMENT_ANALYTICS_KEY "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV)
+  task_def=$(printf "$task_template" $1 $ACCOUNT_ID $ACCOUNT_ID $AWS_ECS_CONTAINER_NAME $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $2 $3 $4 $NODE_ENV $ENABLE_FILE_UPLOAD $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $API_VERSION $AWS_REGION $AUTH_DOMAIN $AUTH_SECRET $VALID_ISSUERS $DB_MASTER_URL $MEMBER_SERVICE_ENDPOINT $IDENTITY_SERVICE_ENDPOINT $BUS_API_URL $MESSAGE_SERVICE_URL $SYSTEM_USER_CLIENT_ID $SYSTEM_USER_CLIENT_SECRET $PROJECTS_ES_URL $PROJECTS_ES_INDEX_NAME $RABBITMQ_URL $DIRECT_PROJECT_SERVICE_ENDPOINT $FILE_SERVICE_ENDPOINT $CONNECT_PROJECTS_URL $SEGMENT_ANALYTICS_KEY "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$KAFKA_CLIENT_CERT" "$KAFKA_CLIENT_CERT_KEY" $KAFKA_GROUP_ID $KAFKA_URL "$AUTH0_PROXY_SERVER_URL" $PORT $PORT $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV)
 }
 
 push_ecr_image(){
diff --git a/package.json b/package.json
index 9aadead8..9ca2d96f 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "pg": "^4.5.5",
     "pg-native": "^1.10.1",
     "sequelize": "^3.23.0",
-    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.3",
+    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.6",
     "traverse": "^0.6.6",
     "urlencode": "^1.1.0"
   },
diff --git a/src/routes/index.js b/src/routes/index.js
index 7dcba789..5af5ff89 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -52,7 +52,7 @@ router.route('/v4/projects/metadata')
 router.all(
   RegExp(`\\/${apiVersion}\\/(projects|timelines)(?!\\/health).*`), (req, res, next) => (
     // JWT authentication
-    jwtAuth()(req, res, next)
+    jwtAuth(config)(req, res, next)
   ),
 );