diff --git a/.circleci/config.yml b/.circleci/config.yml
index e07584d6d..ca598a205 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -83,7 +83,7 @@ jobs:
 
 
 
-  test-11_check-van-mx:
+  test-11_check-vanilla:
     docker:
       - image: 'citus/exttester-11:latest'
     working_directory: /home/circleci/project
@@ -91,12 +91,13 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: 'Install and Test (check-van-mx)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-vanilla check-multi-mx'
+          name: 'Install and Test (check-vanilla)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-vanilla'
           no_output_timeout: 2m
       - codecov/upload:
-          flags: 'test_11,vanilla,mx'
-  test-11_check-iso-work-fol:
+          flags: 'test_11,vanilla'
+
+  test-11_check-mx:
     docker:
       - image: 'citus/exttester-11:latest'
     working_directory: /home/circleci/project
@@ -104,12 +105,40 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: 'Install and Test (check-iso-work-fol)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-isolation check-worker'
+          name: 'Install and Test (check-mx)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-multi-mx'
           no_output_timeout: 2m
       - codecov/upload:
-          flags: 'test_11,isolation,worker'
-  test-11_check-fol:
+          flags: 'test_11,mx'
+
+  test-11_check-worker:
+    docker:
+      - image: 'citus/exttester-11:latest'
+    working_directory: /home/circleci/project
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: 'Install and Test (check-worker)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-worker'
+          no_output_timeout: 2m
+      - codecov/upload:
+          flags: 'test_11,worker'
+
+  test-11_check-isolation:
+    docker:
+      - image: 'citus/exttester-11:latest'
+    working_directory: /home/circleci/project
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: 'Install and Test (check-isolation)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-isolation'
+          no_output_timeout: 2m
+      - codecov/upload:
+          flags: 'test_11,isolation'
+  test-11_check-follower-cluster:
     docker:
       - image: 'citus/exttester-11:latest'
     working_directory: /home/circleci/project
@@ -120,7 +149,7 @@ jobs:
           name: 'Enable core dumps'
           command: 'ulimit -c unlimited'
       - run:
-          name: 'Install and Test (fol)'
+          name: 'Install and Test (follower-cluster)'
           command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-follower-cluster'
           no_output_timeout: 2m
       - run:
@@ -129,7 +158,7 @@ jobs:
             cp core.* /tmp/core_dumps
           when: on_fail
       - codecov/upload:
-          flags: 'test_11,follower'
+          flags: 'test_11,follower-cluster'
       - store_artifacts:
           path: '/tmp/core_dumps'
   test-11_check-failure:
@@ -181,7 +210,7 @@ jobs:
           no_output_timeout: 2m
       - codecov/upload:
           flags: 'test_12,multi'
-  test-12_check-van-mx:
+  test-12_check-vanilla:
     docker:
       - image: 'citus/exttester-12:latest'
     working_directory: /home/circleci/project
@@ -189,12 +218,27 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: 'Install and Test (check-van-mx)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-vanilla check-multi-mx'
+          name: 'Install and Test (check-vanilla)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-vanilla'
           no_output_timeout: 2m
       - codecov/upload:
-          flags: 'test_12,vanilla,mx'
-  test-12_check-iso-work-fol:
+          flags: 'test_12,vanilla'
+
+  test-12_check-mx:
+    docker:
+      - image: 'citus/exttester-12:latest'
+    working_directory: /home/circleci/project
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: 'Install and Test (check-mx)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-multi-mx'
+          no_output_timeout: 2m
+      - codecov/upload:
+          flags: 'test_12,mx'
+
+  test-12_check-isolation:
     docker:
       - image: 'citus/exttester-12:latest'
     working_directory: /home/circleci/project
@@ -202,12 +246,27 @@ jobs:
       - attach_workspace:
            at: .
       - run:
-          name: 'Install and Test (check-iso-work-fol)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-isolation check-worker'
+          name: 'Install and Test (check-isolation)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-isolation'
           no_output_timeout: 2m
       - codecov/upload:
-          flags: 'test_12,isolation,worker'
-  test-12_check-fol:
+          flags: 'test_12,isolation'
+
+  test-12_check-worker:
+    docker:
+      - image: 'citus/exttester-12:latest'
+    working_directory: /home/circleci/project
+    steps:
+      - attach_workspace:
+           at: .
+      - run:
+          name: 'Install and Test (check-worker)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-worker'
+          no_output_timeout: 2m
+      - codecov/upload:
+          flags: 'test_12,worker'
+
+  test-12_check-follower-cluster:
     docker:
       - image: 'citus/exttester-12:latest'
     working_directory: /home/circleci/project
@@ -218,7 +277,7 @@ jobs:
           name: 'Enable core dumps'
           command: 'ulimit -c unlimited'
       - run:
-          name: 'Install and Test (fol)'
+          name: 'Install and Test (follower-cluster)'
           command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-follower-cluster'
           no_output_timeout: 2m
       - run:
@@ -227,7 +286,7 @@ jobs:
             cp core.* /tmp/core_dumps
           when: on_fail
       - codecov/upload:
-          flags: 'test_12,follower'
+          flags: 'test_12,follower-cluster'
       - store_artifacts:
           path: '/tmp/core_dumps'
 
@@ -278,7 +337,7 @@ jobs:
       - codecov/upload:
           flags: 'test_13,multi'
 
-  test-13_check-van-mx:
+  test-13_check-mx:
     docker:
       - image: 'citus/exttester-13:latest'
     working_directory: /home/circleci/project
@@ -286,12 +345,27 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: 'Install and Test (check-van-mx)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-vanilla check-multi-mx'
+          name: 'Install and Test (check-mx)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-multi-mx'
           no_output_timeout: 2m
       - codecov/upload:
-          flags: 'test_13,vanilla,mx'
-  test-13_check-iso-work-fol:
+          flags: 'test_13,mx'
+
+  test-13_check-vanilla:
+    docker:
+      - image: 'citus/exttester-13:latest'
+    working_directory: /home/circleci/project
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: 'Install and Test (check-vanilla)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-vanilla'
+          no_output_timeout: 2m
+      - codecov/upload:
+          flags: 'test_13,vanilla'
+
+  test-13_check-worker:
     docker:
       - image: 'citus/exttester-13:latest'
     working_directory: /home/circleci/project
@@ -299,12 +373,27 @@ jobs:
       - attach_workspace:
            at: .
       - run:
-          name: 'Install and Test (check-iso-work-fol)'
-          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-isolation check-worker'
+          name: 'Install and Test (check-worker)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-worker'
           no_output_timeout: 2m
       - codecov/upload:
-          flags: 'test_13,isolation,worker'
-  test-13_check-fol:
+          flags: 'test_13,worker'
+
+  test-13_check-isolation:
+    docker:
+      - image: 'citus/exttester-13:latest'
+    working_directory: /home/circleci/project
+    steps:
+      - attach_workspace:
+           at: .
+      - run:
+          name: 'Install and Test (check-isolation)'
+          command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-isolation'
+          no_output_timeout: 2m
+      - codecov/upload:
+          flags: 'test_13,isolation'
+
+  test-13_check-follower-cluster:
     docker:
       - image: 'citus/exttester-13:latest'
     working_directory: /home/circleci/project
@@ -315,7 +404,7 @@ jobs:
           name: 'Enable core dumps'
           command: 'ulimit -c unlimited'
       - run:
-          name: 'Install and Test (fol)'
+          name: 'Install and Test (follower-cluster)'
           command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-follower-cluster'
           no_output_timeout: 2m
       - run:
@@ -324,7 +413,7 @@ jobs:
             cp core.* /tmp/core_dumps
           when: on_fail
       - codecov/upload:
-          flags: 'test_13,follower'
+          flags: 'test_13,follower-cluster'
       - store_artifacts:
           path: '/tmp/core_dumps'
 
@@ -395,33 +484,45 @@ workflows:
 
       - test-11_check-multi:
           requires: [build]
-      - test-11_check-van-mx:
+      - test-11_check-vanilla:
           requires: [build]
-      - test-11_check-iso-work-fol:
+      - test-11_check-isolation:
           requires: [build]
-      - test-11_check-fol:
+      - test-11_check-mx:
+          requires: [build]
+      - test-11_check-worker:
+          requires: [build]
+      - test-11_check-follower-cluster:
           requires: [build]
       - test-11_check-failure:
           requires: [build]
 
       - test-12_check-multi:
           requires: [build]
-      - test-12_check-van-mx:
+      - test-12_check-vanilla:
           requires: [build]
-      - test-12_check-iso-work-fol:
+      - test-12_check-isolation:
           requires: [build]
-      - test-12_check-fol:
+      - test-12_check-mx:
+          requires: [build]
+      - test-12_check-worker:
+          requires: [build]
+      - test-12_check-follower-cluster:
           requires: [build]
       - test-12_check-failure:
           requires: [build]
 
       - test-13_check-multi:
           requires: [build]
-      - test-13_check-van-mx:
+      - test-13_check-vanilla:
           requires: [build]
-      - test-13_check-iso-work-fol:
+      - test-13_check-isolation:
           requires: [build]
-      - test-13_check-fol:
+      - test-13_check-mx:
+          requires: [build]
+      - test-13_check-worker:
+          requires: [build]
+      - test-13_check-follower-cluster:
           requires: [build]
       - test-13_check-failure:
           requires: [build]