diff --git a/.circleci/config.yml b/.circleci/config.yml
index cf59b2c..ffc2473 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,23 +1,22 @@
-version: 2
+version: 2.1
 defaults: &defaults
-    docker:
-      - image: cimg/python:3.11.7-browsers
+  docker:
+    - image: cimg/python:3.11.7-browsers
 install_dependency: &install_dependency
   name: Installation of build and deployment dependencies.
   command: |
-    sudo apt update
-    sudo apt install jq
-    sudo apt install python3-pip
+    sudo rm -f /etc/apt/sources.list.d/google-chrome.list || true
+    sudo apt-get update || true
+    sudo apt-get install -y jq python3-pip
     sudo pip3 install awscli --upgrade
-    sudo pip3 install docker==6.1.3
-
 install_deploysuite: &install_deploysuite
   name: Installation of install_deploysuite.
   command: |
-    git clone --branch master_hotfix_v1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+    git clone --branch v1.4.19 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
     cp ./../buildscript/master_deploy.sh .
     cp ./../buildscript/buildenv.sh .
     cp ./../buildscript/awsconfiguration.sh .
+    cp ./../buildscript/psvar-processor.sh .
 restore_cache_settings_for_build: &restore_cache_settings_for_build
   key: docker-node-modules-{{ checksum "package-lock.json" }}
 
@@ -26,22 +25,30 @@ save_cache_settings: &save_cache_settings
   paths:
     - node_modules
 
+run_build: &run_build
+  name: Build of Docker image
+  command: ./build.sh ${APPNAME}
+
 builddeploy_steps: &builddeploy_steps
-      - checkout
-      - setup_remote_docker
-      - run: *install_dependency
-      - run: *install_deploysuite
-      #- restore_cache: *restore_cache_settings_for_build
-      - run: ./build.sh ${APPNAME}
-      - save_cache: *save_cache_settings
-      - deploy:
-          name: Running MasterScript.
-          command: |
-            ./awsconfiguration.sh $DEPLOY_ENV
-            source awsenvconf
-            ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
-            source buildenvvar
-            ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME} -p FARGATE
+  - checkout
+  - setup_remote_docker
+  - run: *install_dependency
+  - run: *install_deploysuite
+  - restore_cache: *restore_cache_settings_for_build
+  - run: *run_build
+  - save_cache: *save_cache_settings
+  - deploy:
+      name: Running deployment.
+      command: |
+        ./awsconfiguration.sh $DEPLOY_ENV
+        source awsenvconf
+        #./buildenv.sh -e DEV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
+        #source buildenvvar
+        #./master_deploy.sh -d ECS -e DEV -t latest -s dev-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME} -p FARGATE
+        #./deploy.sh DEV $CIRCLE_SHA1  
+        ./psvar-processor.sh -t appenv -p /config/${APPNAME}/deployvar
+        source deployvar_env
+        ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -j /config/${APPNAME}/appvar,/config/common/global-appvar -i ${APPNAME} -p FARGATE
 jobs:
   # Build & Deploy against development backend
   "build-dev":
@@ -74,7 +81,7 @@ workflows:
     jobs:
       # Development builds are executed on "develop" branch only.
       - "build-dev":
-          context : org-global
+          context: org-global
           filters:
             branches:
               only:
@@ -83,7 +90,7 @@ workflows:
 
       # Development builds are executed on "develop" branch only.
       - "build-qa":
-          context : org-global
+          context: org-global
           filters:
             branches:
               only:
@@ -92,7 +99,7 @@ workflows:
       # Production builds are exectuted only on tagged commits to the
       # master branch.
       - "build-prod":
-          context : org-global
+          context: org-global
           filters:
             branches:
               only: master
diff --git a/package-lock.json b/package-lock.json
index 87cc5c0..b183781 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,7 @@
         "sequelize": "^6.3.5",
         "stripe": "^8.168.0",
         "superagent": "^6.1.0",
-        "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.4",
+        "tc-core-library-js": "github:topcoder-platform/tc-core-library-js#v2.6.4",
         "urijs": "^1.19.7",
         "util": "^0.12.3",
         "uuid": "^8.3.1",
@@ -930,7 +930,7 @@
         "joi": "^13.4.0",
         "lodash": "^4.17.15",
         "superagent": "^3.8.3",
-        "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.6.4"
+        "tc-core-library-js": "topcoder-platform/tc-core-library-js.git#v2.6.4"
       }
     },
     "node_modules/@topcoder-platform/topcoder-bus-api-wrapper/node_modules/debug": {
@@ -9783,7 +9783,7 @@
     },
     "node_modules/tc-core-library-js": {
       "version": "2.4.1",
-      "resolved": "git+ssh://git@github.com/appirio-tech/tc-core-library-js.git#df0b36c51cf80918194cbff777214b3c0cf5a151",
+      "resolved": "git+ssh://git@github.com/topcoder-platform/tc-core-library-js.git#df0b36c51cf80918194cbff777214b3c0cf5a151",
       "license": "ISC",
       "dependencies": {
         "axios": "^0.19.0",
diff --git a/package.json b/package.json
index 072928e..f5d8cb3 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "sequelize": "^6.3.5",
     "stripe": "^8.168.0",
     "superagent": "^6.1.0",
-    "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.4",
+    "tc-core-library-js": "github:topcoder-platform/tc-core-library-js#v2.6.4",
     "urijs": "^1.19.7",
     "util": "^0.12.3",
     "uuid": "^8.3.1",