diff --git a/.circleci/config.yml b/.circleci/config.yml
index f20c6e0..ada2b16 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,14 +14,14 @@ python_env: &python_env
 install_awscli: &install_awscli
   name: "Install awscli"
   command: |
-    sudo pip install awscli awsebcli --upgrade
+    sudo pip install awscli --upgrade
     aws --version
-    eb --version
+    # eb --version
 
 install_deploysuite: &install_deploysuite
   name: Installation of install_deploysuite.
   command: |
-    git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+    git clone --branch v1.4.15 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
     cp ./../buildscript/master_deploy.sh .
     cp ./../buildscript/buildenv.sh .
     cp ./../buildscript/awsconfiguration.sh .
@@ -54,12 +54,27 @@ deploy_steps: &deploy_steps
 jobs:
   build:
     <<: *java_env
+    environment:
+      BUILD_MAVEN_ENV: "DEV"        
     steps:
       - checkout
       - setup_remote_docker          
       - restore_cache:
           key: tc-elasticsearch-feeder-service-{{ checksum "~/project/pom.xml" }}
-      - run: mvn -f ~/project/pom.xml dependency:go-offline
+      - run: sudo sed -i '/<mirror>/,/<\/mirror>/d' /opt/apache-maven/conf/settings.xml    
+      - run:
+          name: updating and fetching AWS config
+          command: |
+            sudo apt update
+            sudo apt install awscli 
+      - run: *install_deploysuite             
+      - run: 
+          name: Fetching config and dependency
+          command: |
+            ./awsconfiguration.sh $BUILD_MAVEN_ENV
+            source awsenvconf
+            mvn -f ~/project/pom.xml dependency:go-offline
+            rm -rf awsenvconf
       - save_cache:
           paths:
             - ~/.m2
@@ -97,7 +112,8 @@ workflows:
   version: 2
   build-and-deploy:
     jobs:
-      - build
+      - build:
+          context: org-global
       - deploy_dev:
           context : org-global
           filters:
diff --git a/.deploy/buildimage.sh b/.deploy/buildimage.sh
index 789cb38..78108ce 100755
--- a/.deploy/buildimage.sh
+++ b/.deploy/buildimage.sh
@@ -5,6 +5,7 @@ set -e
 
 ENV=$1
 ENV=`echo "$ENV" | tr '[:upper:]' '[:lower:]'`
+CONFIG=$ENV
 # Define script variables
 DEPLOY_DIR="$( cd "$( dirname "$0" )" && pwd )"
 WORKSPACE=$PWD
@@ -18,7 +19,10 @@ echo "Logging into docker"
 echo "############################"
 #docker login $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASSWD
 #docker login -u $DOCKER_USER -p $DOCKER_PASSWD
-aws s3 cp "s3://appirio-platform-$ENV/services/common/dockercfg" ~/.dockercfg
+#aws s3 cp "s3://appirio-platform-$ENV/services/common/dockercfg" ~/.dockercfg
 #TAG=$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$AWS_REPOSITORY:$CIRCLE_SHA1
+DOCKER_USER=$(aws ssm get-parameter --name /$CONFIG/build/dockeruser --with-decryption --output text --query Parameter.Value)
+DOCKER_PASSWD=$(aws ssm get-parameter --name /$CONFIG/build/dockercfg --with-decryption --output text --query Parameter.Value)
+echo $DOCKER_PASSWD | docker login -u $DOCKER_USER --password-stdin
 TAG="elasticsearchfeeder:latest"
 docker build -t $TAG .
diff --git a/pom.xml b/pom.xml
index 09d703b..27a86b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,9 +19,9 @@
     <build>
         <extensions>
             <extension>
-		<groupId>org.kuali.maven.wagons</groupId>
+		<groupId>com.allogy.maven.wagon</groupId>
 		<artifactId>maven-s3-wagon</artifactId>
-		<version>1.2.1</version>
+		<version>1.2.0</version>
      	    </extension>
         </extensions>
 
@@ -310,7 +310,7 @@
     <repositories>
         <repository>
                     <id>tcrepo</id>
-                    <url>http://tc-mvn-repo.s3-website-us-east-1.amazonaws.com/release</url>
+                    <url>s3://tc-mvn-repo/release</url>
                     <snapshots>
                         <enabled>false</enabled>
                         <updatePolicy>always</updatePolicy>
@@ -322,7 +322,7 @@
          </repository>
         <repository>
                 <id>tcreposnap</id>
-                    <url>http://tc-mvn-repo.s3-website-us-east-1.amazonaws.com/snapshot</url>
+                    <url>s3://tc-mvn-repo/snapshot</url>
                     <snapshots>
                     <enabled>true</enabled>
                     <updatePolicy>always</updatePolicy>
@@ -353,16 +353,7 @@
             <url>http://repository.springsource.com/maven/bundles/external</url>
         </repository>
 
-        <repository>
-            <id>Appirio Technology Maven Repository</id>
-            <url>http://maven.topcoder-dev.com:8080/</url>
-            <snapshots>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-            <releases>
-                <updatePolicy>always</updatePolicy>
-            </releases>
-        </repository>
+
     </repositories>
     <reporting>
         <plugins>