diff --git a/.circleci/config.yml b/.circleci/config.yml
index f9d1ecb..4d83e2f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -67,7 +67,7 @@ workflows:
       - "build-dev":
           filters:
             branches:
-              only: [ "develop", "dev-circleci2" ]
+              only: [ "develop", "dev-circleci2", "feature/auth0-proxy-server" ]
       - "build-prod":
           filters:
             branches:
diff --git a/config/default.js b/config/default.js
index 06c2767..67d5ac5 100755
--- a/config/default.js
+++ b/config/default.js
@@ -22,5 +22,6 @@ module.exports = {
   AUTH0_AUDIENCE: process.env.AUTH0_AUDIENCE || 'https://www.topcoder.com',
   TOKEN_CACHE_TIME: process.env.TOKEN_CACHE_TIME,
   AUTH0_CLIENT_ID: process.env.AUTH0_CLIENT_ID,
-  AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET
+  AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET,
+  AUTH0_PROXY_SERVER_URL: process.env.AUTH0_PROXY_SERVER_URL
 }
diff --git a/package.json b/package.json
index 77839ab..534bbc8 100755
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "joi": "^9.0.4",
     "lodash": "^4.17.10",
     "no-kafka": "^3.2.4",
-    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#feature/m2mtoken",
+    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.6",
     "topcoder-healthcheck-dropin": "^1.0.3",
     "winston": "^2.2.0"
   },
diff --git a/src/common/helper.js b/src/common/helper.js
index a3ed549..db77151 100755
--- a/src/common/helper.js
+++ b/src/common/helper.js
@@ -5,7 +5,7 @@
 const _ = require('lodash')
 const config = require('config')
 const m2mAuth = require('tc-core-library-js').auth.m2m
-const m2m = m2mAuth(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'TOKEN_CACHE_TIME']))
+const m2m = m2mAuth(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'TOKEN_CACHE_TIME', 'AUTH0_PROXY_SERVER_URL']))
 
 /* Function to get M2M token
  * @returns m2m token