diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4ee973b3dbb..b64c27067d8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,9 +4,24 @@ orbs:
   azure-cli: circleci/azure-cli@1.0.0
 
 jobs:
-  build:
+
+  build-11:
+    docker:
+      - image: 'heisenberg302/extbuilder:11.9'
+    steps:
+      - checkout
+      - run:
+          name: 'Configure, Build, and Install'
+          command: build-ext
+      - persist_to_workspace:
+          root: .
+          paths:
+            - build-11/*
+            - install-11.tar
+
+  build-12:
     docker:
-      - image: 'citus/extbuilder-13:latest'
+      - image: 'heisenberg302/extbuilder:12.4'
     steps:
       - checkout
       - run:
@@ -14,7 +29,24 @@ jobs:
           command: build-ext
       - persist_to_workspace:
           root: .
-          paths: [.]
+          paths:
+            - build-12/*
+            - install-12.tar
+
+  build-13:
+    docker:
+      - image: 'heisenberg302/extbuilder:13beta'
+    steps:
+      - checkout
+      - run:
+          name: 'Configure, Build, and Install'
+          command: build-ext
+      - persist_to_workspace:
+          root: .
+          paths:
+            - build-13/*
+            - install-13.tar
+
   check-style:
     docker:
       - image: 'citus/stylechecker:latest'
@@ -69,11 +101,17 @@ jobs:
           command: ci/check_sql_snapshots.sh
   test-11_check-multi:
     docker:
-      - image: 'citus/exttester-11:latest'
+      - image: 'heisenberg302/exttester:11.9'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
+      - run:
+          name : "install necessary tools"
+          command: |
+              apt-get update
+              apt-get install -y autoconf build-essential libcurl4-openssl-dev libicu-dev libreadline-dev libselinux1-dev libxslt-dev libssl-dev
       - run:
           name: 'Install and Test (check-multi)'
           command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-multi'
@@ -85,9 +123,10 @@ jobs:
 
   test-11_check-vanilla:
     docker:
-      - image: 'citus/exttester-11:latest'
+      - image: 'heisenberg302/exttester:11.9'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -99,9 +138,10 @@ jobs:
 
   test-11_check-mx:
     docker:
-      - image: 'citus/exttester-11:latest'
+      - image: 'heisenberg302/exttester:11.9'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -113,9 +153,10 @@ jobs:
 
   test-11_check-worker:
     docker:
-      - image: 'citus/exttester-11:latest'
+      - image: 'heisenberg302/exttester:11.9'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -127,9 +168,10 @@ jobs:
 
   test-11_check-isolation:
     docker:
-      - image: 'citus/exttester-11:latest'
+      - image: 'heisenberg302/exttester:11.9'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -140,9 +182,10 @@ jobs:
           flags: 'test_11,isolation'
   test-11_check-follower-cluster:
     docker:
-      - image: 'citus/exttester-11:latest'
+      - image: 'heisenberg302/exttester:11.9'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -163,9 +206,10 @@ jobs:
           path: '/tmp/core_dumps'
   test-11_check-failure:
     docker:
-      - image: 'citus/failtester-11:latest'
+      - image: 'heisenberg302/failtester:11.9'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -175,11 +219,17 @@ jobs:
 
   test-11-12_check-pg-upgrade:
     docker:
-      - image: 'citus/pgupgradetester:latest'
+      - image: 'heisenberg302/pgupgradetester:latest'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
+      - run:
+          name : "install necessary tools"
+          command: |
+              apt-get update
+              apt-get install -y autoconf build-essential libcurl4-openssl-dev libicu-dev libreadline-dev libselinux1-dev libxslt-dev libssl-dev
       - run:
           name: 'Install and test postgres upgrade'
           command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext --target check-pg-upgrade --old-pg-version 11 --new-pg-version 12'
@@ -187,9 +237,10 @@ jobs:
 
   test-12-13_check-pg-upgrade:
     docker:
-      - image: 'citus/pgupgradetester:latest'
+      - image: 'heisenberg302/pgupgradetester:latest'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -199,9 +250,10 @@ jobs:
 
   test-12_check-multi:
     docker:
-      - image: 'citus/exttester-12:latest'
+      - image: 'heisenberg302/exttester:12.4'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -212,9 +264,10 @@ jobs:
           flags: 'test_12,multi'
   test-12_check-vanilla:
     docker:
-      - image: 'citus/exttester-12:latest'
+      - image: 'heisenberg302/exttester:12.4'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -226,9 +279,10 @@ jobs:
 
   test-12_check-mx:
     docker:
-      - image: 'citus/exttester-12:latest'
+      - image: 'heisenberg302/exttester:12.4'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -240,9 +294,10 @@ jobs:
 
   test-12_check-isolation:
     docker:
-      - image: 'citus/exttester-12:latest'
+      - image: 'heisenberg302/exttester:12.4'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
            at: .
       - run:
@@ -254,9 +309,10 @@ jobs:
 
   test-12_check-worker:
     docker:
-      - image: 'citus/exttester-12:latest'
+      - image: 'heisenberg302/exttester:12.4'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
            at: .
       - run:
@@ -268,9 +324,10 @@ jobs:
 
   test-12_check-follower-cluster:
     docker:
-      - image: 'citus/exttester-12:latest'
+      - image: 'heisenberg302/exttester:12.4'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -292,9 +349,10 @@ jobs:
 
   test-12_check-failure:
     docker:
-      - image: 'citus/failtester-12:latest'
+      - image: 'heisenberg302/failtester:12.4'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -304,10 +362,12 @@ jobs:
 
   test-11_check-citus-upgrade:
     docker:
-      - image: 'citus/citusupgradetester-11:latest'
+      - image: 'heisenberg302/citusupgradetester:11.9'
     working_directory: /home/circleci/project
     steps:
-      - {attach_workspace: {at: .}}
+      - checkout
+      - attach_workspace:
+          at: .
       - run:
           name: 'Install and test citus upgrade'
           command: |
@@ -325,9 +385,10 @@ jobs:
 
   test-13_check-multi:
     docker:
-      - image: 'citus/exttester-13:latest'
+      - image: 'heisenberg302/exttester:13beta'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -339,9 +400,10 @@ jobs:
 
   test-13_check-mx:
     docker:
-      - image: 'citus/exttester-13:latest'
+      - image: 'heisenberg302/exttester:13beta'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -353,9 +415,10 @@ jobs:
 
   test-13_check-vanilla:
     docker:
-      - image: 'citus/exttester-13:latest'
+      - image: 'heisenberg302/exttester:13beta'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -367,9 +430,10 @@ jobs:
 
   test-13_check-worker:
     docker:
-      - image: 'citus/exttester-13:latest'
+      - image: 'heisenberg302/exttester:13beta'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
            at: .
       - run:
@@ -381,9 +445,10 @@ jobs:
 
   test-13_check-isolation:
     docker:
-      - image: 'citus/exttester-13:latest'
+      - image: 'heisenberg302/exttester:13beta'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
            at: .
       - run:
@@ -395,9 +460,10 @@ jobs:
 
   test-13_check-follower-cluster:
     docker:
-      - image: 'citus/exttester-13:latest'
+      - image: 'heisenberg302/exttester:13beta'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -419,9 +485,10 @@ jobs:
 
   test-13_check-failure:
     docker:
-      - image: 'citus/failtester-13:latest'
+      - image: 'heisenberg302/failtester:13beta'
     working_directory: /home/circleci/project
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - run:
@@ -472,77 +539,87 @@ workflows:
   version: 2
   build_and_test:
     jobs:
+
       - check-merge-to-enterprise:
           filters:
             branches:
               ignore:
                 - /release-[0-9]+\.[0-9]+.*/ # match with releaseX.Y.*
 
-      - build
+
+      - build-11
+      - build-12
+      - build-13
+
       - check-style
       - check-sql-snapshots
 
       - test-11_check-multi:
-          requires: [build]
+          requires: [build-11]
       - test-11_check-vanilla:
-          requires: [build]
+          requires: [build-11]
       - test-11_check-isolation:
-          requires: [build]
+          requires: [build-11]
       - test-11_check-mx:
-          requires: [build]
+          requires: [build-11]
       - test-11_check-worker:
-          requires: [build]
+          requires: [build-11]
       - test-11_check-follower-cluster:
-          requires: [build]
+          requires: [build-11]
       - test-11_check-failure:
-          requires: [build]
+          requires: [build-11]
 
       - test-12_check-multi:
-          requires: [build]
+          requires: [build-12]
       - test-12_check-vanilla:
-          requires: [build]
+          requires: [build-12]
       - test-12_check-isolation:
-          requires: [build]
+          requires: [build-12]
       - test-12_check-mx:
-          requires: [build]
+          requires: [build-12]
       - test-12_check-worker:
-          requires: [build]
+          requires: [build-12]
       - test-12_check-follower-cluster:
-          requires: [build]
+          requires: [build-12]
       - test-12_check-failure:
-          requires: [build]
+          requires: [build-12]
 
       - test-13_check-multi:
-          requires: [build]
+          requires: [build-13]
       - test-13_check-vanilla:
-          requires: [build]
+          requires: [build-13]
       - test-13_check-isolation:
-          requires: [build]
+          requires: [build-13]
       - test-13_check-mx:
-          requires: [build]
+          requires: [build-13]
       - test-13_check-worker:
-          requires: [build]
+          requires: [build-13]
       - test-13_check-follower-cluster:
-          requires: [build]
+          requires: [build-13]
       - test-13_check-failure:
-          requires: [build]
+          requires: [build-13]
 
       - test-11-12_check-pg-upgrade:
-          requires: [build]
+          requires:
+            - build-11
+            - build-12
+
       - test-12-13_check-pg-upgrade:
-          requires: [build]
+          requires:
+            - build-12
+            - build-13
 
       - test-11_check-citus-upgrade:
-          requires: [build]
+          requires: [build-11]
 
       - ch_benchmark:
-          requires: [build]
+          requires: [build-13]
           filters:
             branches:
               only:
                 - /ch_benchmark\/.*/ # match with ch_benchmark/ prefix
       - tpcc_benchmark:
-          requires: [build]
+          requires: [build-13]
           filters:
             branches:
               only: