diff --git a/.circleci/config.yml b/.circleci/config.yml
index ffa4161..ae4308b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,28 +14,28 @@ commands:
         type: string
         default: "staging"
     steps:
-    - attach_workspace:
-        at: ~/artifacts
+      - attach_workspace:
+          at: ~/artifacts
 
-    - run: sudo apt-get install make openssl
+      - run: sudo apt-get install make openssl
 
-    - run: curl -L https://github.com/avniproject/avni-infra/archive/master.zip >> ~/infra.zip
+      - run: curl -L https://github.com/avniproject/avni-infra/archive/master.zip >> ~/infra.zip
 
-    - run: |
-        cd ~/
-        unzip infra.zip
-        mv avni-infra-master avni-infra
-        rm -rf infra.zip
+      - run: |
+          cd ~/
+          unzip infra.zip
+          mv avni-infra-master avni-infra
+          rm -rf infra.zip
 
-    - run: echo $ANSIBLE_VAULT_PASS > ~/.vault-pass.txt
+      - run: echo $ANSIBLE_VAULT_PASS > ~/.vault-pass.txt
 
-    - run: |
-        pwd
-        cd ~/avni-infra/configure
-        mv ~/artifacts/avni-etl.jar ~/artifacts/etl-1.0.0-SNAPSHOT.jar
-        VAULT_PASSWORD_FILE=~/.vault-pass.txt app_zip_path=~/artifacts/ make deploy-etl-<< parameters.env >>
+      - run: |
+          pwd
+          cd ~/avni-infra/configure
+          mv ~/artifacts/avni-etl.jar ~/artifacts/etl-1.0.0-SNAPSHOT.jar
+          VAULT_PASSWORD_FILE=~/.vault-pass.txt app_zip_path=~/artifacts/ make deploy-etl-<< parameters.env >>
 
-    - run: rm ~/.vault-pass.txt
+      - run: rm ~/.vault-pass.txt
 
   setup_server_access:
     description: Generate and copy temporary keys to server
@@ -103,7 +103,7 @@ jobs:
 
   build:
     docker:
-    - image: cimg/openjdk:17.0.5
+      - image: cimg/openjdk:17.0.5
 
     working_directory: ~/avni-etl
 
@@ -114,34 +114,34 @@ jobs:
       - MAVEN_OPTS: -Xmx3200m
 
     steps:
-    - checkout
+      - checkout
 
-    - run: sudo apt-get install make openssl
+      - run: sudo apt-get install make openssl
 
-    - run: make build_jar
+      - run: make build_jar
 
-    - run: mkdir -p ~/artifacts;
+      - run: mkdir -p ~/artifacts;
 
-    - run: cp ~/avni-etl/build/libs/etl-1.0.0-SNAPSHOT.jar ~/artifacts/avni-etl.jar;
+      - run: cp ~/avni-etl/build/libs/etl-1.0.0-SNAPSHOT.jar ~/artifacts/avni-etl.jar;
 
-    - persist_to_workspace:
-        root: ~/artifacts
-        paths:
-        - avni-etl.jar
+      - persist_to_workspace:
+          root: ~/artifacts
+          paths:
+            - avni-etl.jar
 
-    - store_artifacts:
-        path: ~/artifacts
+      - store_artifacts:
+          path: ~/artifacts
 
   STAGING_deploy:
     docker:
-    - image: cimg/deploy:2023.09
-      environment:
-        ANSIBLE_HOST_KEY_CHECKING: no
+      - image: cimg/deploy:2023.09
+        environment:
+          ANSIBLE_HOST_KEY_CHECKING: no
     working_directory: ~/
     steps:
-    - deploy:
-        hostname: "int-staging.avniproject.org"
-        env: "staging"
+      - deploy:
+          hostname: "int-staging.avniproject.org"
+          env: "staging"
 
   PRERELEASE_deploy:
     docker: