diff --git a/.circleci/config.yml b/.circleci/config.yml
index 63625a142..544902556 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
 parameters:
   image_suffix:
     type: string
-    default: '-v9372c09'
+    default: '-dev-f97be6d'
   pg13_version:
     type: string
     default: '13.9'
@@ -163,6 +163,11 @@ jobs:
               exit 1
             fi
           when: on_fail
+      - run:
+          name: 'Create codeclimate coverage'
+          command: |
+            lcov --directory . --capture --output-file lcov.info
+            codeclimate/test-reporter format-coverage -t lcov -o codeclimate/$(openssl rand -hex 30).json lcov.info
       - run:
           name: 'Copy coredumps'
           command: |
@@ -248,6 +253,11 @@ jobs:
             fi
 
           when: on_fail
+      - run:
+          name: 'Create codeclimate coverage'
+          command: |
+            lcov --directory . --capture --output-file lcov.info
+            codeclimate/test-reporter format-coverage -t lcov -o codeclimate/$(openssl rand -hex 30).json lcov.info
       - run:
           name: 'Copy logfiles'
           command: |
@@ -335,6 +345,11 @@ jobs:
               exit 1
             fi
           when: on_fail
+      - run:
+          name: 'Create codeclimate coverage'
+          command: |
+            lcov --directory . --capture --output-file lcov.info
+            codeclimate/test-reporter format-coverage -t lcov -o codeclimate/$(openssl rand -hex 30).json lcov.info
       - run:
           name: 'Copy coredumps'
           command: |
@@ -397,7 +412,7 @@ jobs:
           name: 'Create codeclimate coverage'
           command: |
             lcov --directory . --capture --output-file lcov.info
-            test-reporter format-coverage -t lcov -o codeclimate/$(openssl rand -hex 30).json lcov.info
+            codeclimate/test-reporter format-coverage -t lcov -o codeclimate/$(openssl rand -hex 30).json lcov.info
       - run:
           name: 'Regressions'
           command: |
@@ -484,6 +499,11 @@ jobs:
           command: |
             gosu circleci make -C src/test/<< parameters.suite >> << parameters.make >>
           no_output_timeout: 2m
+      - run:
+          name: 'Create codeclimate coverage'
+          command: |
+            lcov --directory . --capture --output-file lcov.info
+            codeclimate/test-reporter format-coverage -t lcov -o codeclimate/$(openssl rand -hex 30).json lcov.info
       - run:
           name: 'Copy coredumps'
           command: |