diff --git a/.circleci/config.yml b/.circleci/config.yml
index 878c532fe..6b8e43586 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -102,7 +102,7 @@ jobs:
       image_tag:
         description: 'docker image tag to use'
         type: string
-        default: 11-12-13
+        default: 11-12-13-dev202104301224
     docker:
       - image: '<< parameters.image >>:<< parameters.image_tag >>'
     working_directory: /home/circleci/project
@@ -378,7 +378,7 @@ jobs:
 
   check-merge-to-enterprise:
     docker:
-      - image: citus/extbuilder:13.0
+      - image: citus/extbuilder:13.2-dev202104301224
     working_directory: /home/circleci/project
     steps:
       - checkout
@@ -430,11 +430,11 @@ workflows:
       - build:
           name: build-12
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
       - build:
           name: build-13
           pg_major: 13
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
 
       - check-style
       - check-sql-snapshots
@@ -442,136 +442,136 @@ workflows:
       - test-citus:
           name: 'test-12_check-multi'
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           make: check-multi
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-mx'
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           make: check-multi-mx
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-vanilla'
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           make: check-vanilla
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-isolation'
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           make: check-isolation
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-worker'
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           make: check-worker
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-operations'
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           make: check-operations
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-follower-cluster'
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           make: check-follower-cluster
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-columnar'
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           make: check-columnar
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-columnar-isolation'
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           make: check-columnar-isolation
           requires: [build-12]
       - tap-test-citus:
           name: 'test_12_tap-recovery'
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           suite: recovery
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-failure'
           pg_major: 12
           image: citus/failtester
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           make: check-failure
           requires: [build-12]
 
       - test-citus:
           name: 'test-13_check-multi'
           pg_major: 13
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
           make: check-multi
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-mx'
           pg_major: 13
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
           make: check-multi-mx
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-vanilla'
           pg_major: 13
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
           make: check-vanilla
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-isolation'
           pg_major: 13
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
           make: check-isolation
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-worker'
           pg_major: 13
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
           make: check-worker
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-operations'
           pg_major: 13
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
           make: check-operations
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-follower-cluster'
           pg_major: 13
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
           make: check-follower-cluster
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-columnar'
           pg_major: 13
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
           make: check-columnar
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-columnar-isolation'
           pg_major: 13
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
           make: check-columnar-isolation
           requires: [build-13]
       - tap-test-citus:
           name: 'test_13_tap-recovery'
           pg_major: 13
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
           suite: recovery
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-failure'
           pg_major: 13
           image: citus/failtester
-          image_tag: '13.0'
+          image_tag: '13.2-dev202104301224'
           make: check-failure
           requires: [build-13]
 
@@ -579,13 +579,13 @@ workflows:
           name: 'test-12-13_check-pg-upgrade'
           old_pg_major: 12
           new_pg_major: 13
-          image_tag: 11-12-13
+          image_tag: 11-12-13-dev202104301224
           requires: [build-12,build-13]
 
       - test-citus-upgrade:
           name: test-12_check-citus-upgrade
           pg_major: 12
-          image_tag: '12.4'
+          image_tag: '12.6-dev202104301224'
           requires: [build-12]
 
       - ch_benchmark: