diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2d0a144b5..1b064d8f2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -439,11 +439,11 @@ workflows:
       - build:
           name: build-12
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
       - build:
           name: build-13
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
       - build:
           name: build-14
           pg_major: 14
@@ -455,148 +455,148 @@ workflows:
       - test-citus:
           name: 'test-12_check-multi'
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           make: check-multi
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-multi-1'
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           make: check-multi-1
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-mx'
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           make: check-multi-mx
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-vanilla'
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           make: check-vanilla
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-isolation'
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           make: check-isolation
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-worker'
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           make: check-worker
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-operations'
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           make: check-operations
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-follower-cluster'
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           make: check-follower-cluster
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-columnar'
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           make: check-columnar
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-columnar-isolation'
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           make: check-columnar-isolation
           requires: [build-12]
       - tap-test-citus:
           name: 'test_12_tap-recovery'
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           suite: recovery
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-failure'
           pg_major: 12
           image: citus/failtester
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           make: check-failure
           requires: [build-12]
 
       - test-citus:
           name: 'test-13_check-multi'
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           make: check-multi
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-multi-1'
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           make: check-multi-1
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-mx'
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           make: check-multi-mx
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-vanilla'
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           make: check-vanilla
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-isolation'
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           make: check-isolation
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-worker'
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           make: check-worker
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-operations'
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           make: check-operations
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-follower-cluster'
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           make: check-follower-cluster
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-columnar'
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           make: check-columnar
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-columnar-isolation'
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           make: check-columnar-isolation
           requires: [build-13]
       - tap-test-citus:
           name: 'test_13_tap-recovery'
           pg_major: 13
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           suite: recovery
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-failure'
           pg_major: 13
           image: citus/failtester
-          image_tag: '13.2-dev202108191715'
+          image_tag: '13.2'
           make: check-failure
           requires: [build-13]
 
@@ -691,7 +691,7 @@ workflows:
       - test-citus-upgrade:
           name: test-12_check-citus-upgrade
           pg_major: 12
-          image_tag: '12.6-dev202108191715'
+          image_tag: '12.6'
           requires: [build-12]
 
       - ch_benchmark: