diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6f20ad5..ea9e3a7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -89,4 +89,4 @@ workflows:
             - test
           filters:
             branches:
-              only: [dev, dev-circleci2]
+              only: [dev, 'feature/auth0-proxy-server']
diff --git a/Dockerfile b/Dockerfile
index 64d8950..cfb4c25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6
+FROM node:8.2.1
 LABEL version="1.0"
 LABEL description="Connect Messages Serivce"
 
diff --git a/config/custom-environment-variables.js b/config/custom-environment-variables.js
index 07e29b9..b6c21ac 100644
--- a/config/custom-environment-variables.js
+++ b/config/custom-environment-variables.js
@@ -23,4 +23,5 @@ module.exports = {
   TOKEN_CACHE_TIME: 'TOKEN_CACHE_TIME',
   AUTH0_CLIENT_ID: 'AUTH0_CLIENT_ID',
   AUTH0_CLIENT_SECRET: 'AUTH0_CLIENT_SECRET',
+  AUTH0_PROXY_SERVER_URL: 'AUTH0_PROXY_SERVER_URL',
 };
diff --git a/config/default.js b/config/default.js
index 62b9fd8..8b79921 100644
--- a/config/default.js
+++ b/config/default.js
@@ -44,4 +44,5 @@ module.exports = {
   SLACK_ICON_URL: 'https://emoji.slack-edge.com/T03R80JP7/coder-grinning/a3b7f3fe9e838377.png',
   SLACK_USERNAME: 'Coder',
   TOPCODER_ICON_URL: 'https://emoji.slack-edge.com/T03R80JP7/topcoder/7c68acd90a6b6d77.png',
+  AUTH0_PROXY_SERVER_URL: '',
 };
diff --git a/deploy.sh b/deploy.sh
index 48bfa5a..d59a533 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -82,6 +82,10 @@ make_task_def(){
 				{
 					"name": "TOKEN_CACHE_TIME",
 					"value": "%s"
+				},
+				{
+					"name": "AUTH0_PROXY_SERVER_URL",
+					"value": "%s"
 				}
 			],
 			"logConfiguration": {
@@ -103,6 +107,7 @@ make_task_def(){
 	TOKEN_CACHE_TIME=$(eval "echo \$${ENV}_TOKEN_CACHE_TIME")
 	AUTH0_CLIENT_ID=$(eval "echo \$${ENV}_AUTH0_CLIENT_ID")
 	AUTH0_CLIENT_SECRET=$(eval "echo \$${ENV}_AUTH0_CLIENT_SECRET")
+	AUTH0_PROXY_SERVER_URL=$(eval "echo \$${ENV}_AUTH0_PROXY_SERVER_URL")
 
 	if [ "$ENV" = "PROD" ]; then
 		NODE_ENV=production
@@ -110,7 +115,7 @@ make_task_def(){
 		NODE_ENV=development
 	fi
 
-	task_def=$(printf "$task_template" $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $NODE_ENV $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $RABBITMQ_URL $TC_SLACK_WEBHOOK_URL "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV)
+	task_def=$(printf "$task_template" $ACCOUNT_ID $AWS_REGION $AWS_REPOSITORY $CIRCLE_SHA1 $NODE_ENV $LOG_LEVEL $CAPTURE_LOGS $LOGENTRIES_TOKEN $RABBITMQ_URL $TC_SLACK_WEBHOOK_URL "$AUTH0_URL" "$AUTH0_AUDIENCE" $AUTH0_CLIENT_ID "$AUTH0_CLIENT_SECRET" $TOKEN_CACHE_TIME "$AUTH0_PROXY_SERVER_URL" $AWS_ECS_CLUSTER $AWS_REGION $NODE_ENV)
 }
 
 push_ecr_image(){
diff --git a/package.json b/package.json
index 3672438..24f02ab 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "jackrabbit": "^4.3.0",
     "lodash": "^4.16.6",
     "request": "^2.78.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"
   },
   "devDependencies": {
     "babel-cli": "^6.9.0",