diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8c5de32b2..4f6dd3335 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,6 +3,11 @@ orbs:
   codecov: codecov/codecov@1.1.1
   azure-cli: circleci/azure-cli@1.0.0
 
+parameters:
+  image_suffix:
+    type: string
+    default: "-dev202110211711"
+
 jobs:
 
   build:
@@ -19,7 +24,7 @@ jobs:
         description: tag to use for the docker image
         type: string
     docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >>'
+      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
     steps:
       - checkout
       - run:
@@ -113,7 +118,7 @@ jobs:
         type: string
         default: 12-13
     docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >>'
+      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
     working_directory: /home/circleci/project
     steps:
       - checkout
@@ -185,7 +190,7 @@ jobs:
         type: string
         default: 12-13
     docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >>'
+      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
     resource_class: xlarge
     working_directory: /home/circleci/project
     steps:
@@ -265,7 +270,7 @@ jobs:
         description: 'docker image tag to use'
         type: string
     docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >>'
+      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
     working_directory: /home/circleci/project
     steps:
       - checkout
@@ -350,7 +355,7 @@ jobs:
         description: "make target"
         type: string
     docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >>'
+      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
     working_directory: /home/circleci/project
     steps:
       - checkout
@@ -397,7 +402,6 @@ jobs:
       - store_artifacts:
           name: 'Save mitmproxy output (failure test specific)'
           path: src/test/regress/proxy.output
-          when: on_fail
       - store_artifacts:
           name: 'Save results'
           path: src/test/regress/results/
@@ -431,7 +435,7 @@ jobs:
         type: string
         default: installcheck
     docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >>'
+      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
     working_directory: /home/circleci/project
     steps:
       - checkout
@@ -529,15 +533,15 @@ workflows:
       - build:
           name: build-12
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
       - build:
           name: build-13
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
       - build:
           name: build-14
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
 
       - check-style
       - check-sql-snapshots
@@ -545,266 +549,266 @@ workflows:
       - test-citus:
           name: 'test-12_check-multi'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           make: check-multi
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-multi-1'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           make: check-multi-1
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-mx'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           make: check-multi-mx
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-vanilla'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           make: check-vanilla
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-isolation'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           make: check-isolation
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-worker'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           make: check-worker
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-operations'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           make: check-operations
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-follower-cluster'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           make: check-follower-cluster
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-columnar'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           make: check-columnar
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-columnar-isolation'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           make: check-columnar-isolation
           requires: [build-12]
       - tap-test-citus:
           name: 'test_12_tap-recovery'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           suite: recovery
           requires: [build-12]
       - test-citus:
           name: 'test-12_check-failure'
           pg_major: 12
           image: citus/failtester
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           make: check-failure
           requires: [build-12]
 
       - test-citus:
           name: 'test-13_check-multi'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           make: check-multi
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-multi-1'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           make: check-multi-1
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-mx'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           make: check-multi-mx
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-vanilla'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           make: check-vanilla
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-isolation'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           make: check-isolation
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-worker'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           make: check-worker
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-operations'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           make: check-operations
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-follower-cluster'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           make: check-follower-cluster
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-columnar'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           make: check-columnar
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-columnar-isolation'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           make: check-columnar-isolation
           requires: [build-13]
       - tap-test-citus:
           name: 'test_13_tap-recovery'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           suite: recovery
           requires: [build-13]
       - test-citus:
           name: 'test-13_check-failure'
           pg_major: 13
           image: citus/failtester
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           make: check-failure
           requires: [build-13]
 
       - test-citus:
           name: 'test-14_check-multi'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           make: check-multi
           requires: [build-14]
       - test-citus:
           name: 'test-14_check-multi-1'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           make: check-multi-1
           requires: [build-14]
       - test-citus:
           name: 'test-14_check-mx'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           make: check-multi-mx
           requires: [build-14]
       - test-citus:
           name: 'test-14_check-vanilla'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           make: check-vanilla
           requires: [build-14]
       - test-citus:
           name: 'test-14_check-isolation'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           make: check-isolation
           requires: [build-14]
       - test-citus:
           name: 'test-14_check-worker'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           make: check-worker
           requires: [build-14]
       - test-citus:
           name: 'test-14_check-operations'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           make: check-operations
           requires: [build-14]
       - test-citus:
           name: 'test-14_check-follower-cluster'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           make: check-follower-cluster
           requires: [build-14]
       - test-citus:
           name: 'test-14_check-columnar'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           make: check-columnar
           requires: [build-14]
       - test-citus:
           name: 'test-14_check-columnar-isolation'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           make: check-columnar-isolation
           requires: [build-14]
       - tap-test-citus:
           name: 'test_14_tap-recovery'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           suite: recovery
           requires: [build-14]
       - test-citus:
           name: 'test-14_check-failure'
           pg_major: 14
           image: citus/failtester
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           make: check-failure
           requires: [build-14]
 
       - test-arbitrary-configs:
           name: 'test-12_check-arbitrary-configs'
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           requires: [build-12]
       - test-arbitrary-configs:
           name: 'test-13_check-arbitrary-configs'
           pg_major: 13
-          image_tag: '13.4-dev202110211711'
+          image_tag: '13.4'
           requires: [build-13]
       - test-arbitrary-configs:
           name: 'test-14_check-arbitrary-configs'
           pg_major: 14
-          image_tag: '14.0-dev202110211711'
+          image_tag: '14.0'
           requires: [build-14]
 
       - test-pg-upgrade:
           name: 'test-12-13_check-pg-upgrade'
           old_pg_major: 12
           new_pg_major: 13
-          image_tag: '12.8-13.4-14.0-dev202110211711'
+          image_tag: '12.8-13.4-14.0'
           requires: [build-12,build-13]
 
       - test-pg-upgrade:
           name: 'test-12-14_check-pg-upgrade'
           old_pg_major: 12
           new_pg_major: 14
-          image_tag: '12.8-13.4-14.0-dev202110211711'
+          image_tag: '12.8-13.4-14.0'
           requires: [build-12,build-14]
 
       - test-pg-upgrade:
           name: 'test-13-14_check-pg-upgrade'
           old_pg_major: 13
           new_pg_major: 14
-          image_tag: '12.8-13.4-14.0-dev202110211711'
+          image_tag: '12.8-13.4-14.0'
           requires: [build-13,build-14]
 
       - test-citus-upgrade:
           name: test-12_check-citus-upgrade
           pg_major: 12
-          image_tag: '12.8-dev202110211711'
+          image_tag: '12.8'
           requires: [build-12]
 
       - ch_benchmark: