diff --git a/.circleci/config.yml b/.circleci/config.yml
index 582c9e566..145408d3f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -163,12 +163,6 @@ jobs:
               exit 1
             fi
           when: on_fail
-      - run:
-          name: 'Create codeclimate coverage'
-          command: |
-            lcov --directory . --capture --output-file lcov.info
-            sed "s=^SF:$PWD=SF:=g" -i lcov.info # relative pats are required by codeclimate
-            codeclimate/test-reporter format-coverage -t lcov -o codeclimate/$CIRCLE_JOB.json lcov.info
       - run:
           name: 'Copy coredumps'
           command: |
@@ -197,10 +191,17 @@ jobs:
           path: /tmp/pg_upgrade_newData_logs
       - codecov/upload:
           flags: 'test_<< parameters.old_pg_major >>_<< parameters.new_pg_major >>,upgrade'
+      - run:
+          name: 'Create codeclimate coverage'
+          command: |
+            lcov --directory . --capture --output-file lcov.info
+            sed "s=^SF:$PWD/=SF:=g" -i lcov.info # relative pats are required by codeclimate
+            mkdir -p /tmp/codeclimate
+            codeclimate/test-reporter format-coverage -t lcov -o /tmp/codeclimate/$CIRCLE_JOB.json lcov.info
       - persist_to_workspace:
-          root: .
+          root: /tmp
           paths:
-            - codeclimate/$CIRCLE_JOB.json
+            - codeclimate/*.json
 
   test-arbitrary-configs:
     description: Runs tests on arbitrary configs
@@ -259,12 +260,6 @@ jobs:
             fi
 
           when: on_fail
-      - run:
-          name: 'Create codeclimate coverage'
-          command: |
-            lcov --directory . --capture --output-file lcov.info
-            sed "s=^SF:$PWD=SF:=g" -i lcov.info # relative pats are required by codeclimate
-            codeclimate/test-reporter format-coverage -t lcov -o codeclimate/$CIRCLE_JOB.json lcov.info
       - run:
           name: 'Copy logfiles'
           command: |
@@ -288,10 +283,17 @@ jobs:
           path: src/test/regress/tmp_citus_test/logfiles
       - codecov/upload:
           flags: 'test_<< parameters.pg_major >>,upgrade'
+      - run:
+          name: 'Create codeclimate coverage'
+          command: |
+            lcov --directory . --capture --output-file lcov.info
+            sed "s=^SF:$PWD/=SF:=g" -i lcov.info # relative pats are required by codeclimate
+            mkdir -p /tmp/codeclimate
+            codeclimate/test-reporter format-coverage -t lcov -o /tmp/codeclimate/$CIRCLE_JOB.json lcov.info
       - persist_to_workspace:
-          root: .
+          root: /tmp
           paths:
-            - codeclimate/$CIRCLE_JOB.json
+            - codeclimate/*.json
 
   test-citus-upgrade:
     description: Runs citus upgrade tests
@@ -357,12 +359,6 @@ jobs:
               exit 1
             fi
           when: on_fail
-      - run:
-          name: 'Create codeclimate coverage'
-          command: |
-            lcov --directory . --capture --output-file lcov.info
-            sed "s=^SF:$PWD=SF:=g" -i lcov.info # relative pats are required by codeclimate
-            codeclimate/test-reporter format-coverage -t lcov -o codeclimate/$CIRCLE_JOB.json lcov.info
       - run:
           name: 'Copy coredumps'
           command: |
@@ -380,10 +376,17 @@ jobs:
           path: /tmp/core_dumps
       - codecov/upload:
           flags: 'test_<< parameters.pg_major >>,upgrade'
+      - run:
+          name: 'Create codeclimate coverage'
+          command: |
+            lcov --directory . --capture --output-file lcov.info
+            sed "s=^SF:$PWD/=SF:=g" -i lcov.info # relative pats are required by codeclimate
+            mkdir -p /tmp/codeclimate
+            codeclimate/test-reporter format-coverage -t lcov -o /tmp/codeclimate/$CIRCLE_JOB.json lcov.info
       - persist_to_workspace:
-          root: .
+          root: /tmp
           paths:
-            - codeclimate/$CIRCLE_JOB.json
+            - codeclimate/*.json
 
   test-citus:
     description: Runs the common tests of citus
@@ -426,12 +429,6 @@ jobs:
           command: |
             gosu circleci make -C src/test/regress << parameters.make >>
           no_output_timeout: 2m
-      - run:
-          name: 'Create codeclimate coverage'
-          command: |
-            lcov --directory . --capture --output-file lcov.info
-            sed "s=^SF:$PWD=SF:=g" -i lcov.info # relative pats are required by codeclimate
-            codeclimate/test-reporter format-coverage -t lcov -o codeclimate/$CIRCLE_JOB.json lcov.info
       - run:
           name: 'Regressions'
           command: |
@@ -473,10 +470,17 @@ jobs:
       - codecov/upload:
           flags: 'test_<< parameters.pg_major >>,<< parameters.make >>'
           when: always
+      - run:
+          name: 'Create codeclimate coverage'
+          command: |
+            lcov --directory . --capture --output-file lcov.info
+            sed "s=^SF:$PWD/=SF:=g" -i lcov.info # relative pats are required by codeclimate
+            mkdir -p /tmp/codeclimate
+            codeclimate/test-reporter format-coverage -t lcov -o /tmp/codeclimate/$CIRCLE_JOB.json lcov.info
       - persist_to_workspace:
-          root: .
+          root: /tmp
           paths:
-            - codeclimate/$CIRCLE_JOB.json
+            - codeclimate/*.json
 
   tap-test-citus:
     description: Runs tap tests for citus
@@ -523,12 +527,6 @@ 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
-            sed "s=^SF:$PWD=SF:=g" -i lcov.info # relative pats are required by codeclimate
-            codeclimate/test-reporter format-coverage -t lcov -o codeclimate/$CIRCLE_JOB.json lcov.info
       - run:
           name: 'Copy coredumps'
           command: |
@@ -547,10 +545,17 @@ jobs:
       - codecov/upload:
           flags: 'test_<< parameters.pg_major >>,tap_<< parameters.suite >>_<< parameters.make >>'
           when: always
+      - run:
+          name: 'Create codeclimate coverage'
+          command: |
+            lcov --directory . --capture --output-file lcov.info
+            sed "s=^SF:$PWD/=SF:=g" -i lcov.info # relative pats are required by codeclimate
+            mkdir -p /tmp/codeclimate
+            codeclimate/test-reporter format-coverage -t lcov -o /tmp/codeclimate/$CIRCLE_JOB.json lcov.info
       - persist_to_workspace:
-          root: .
+          root: /tmp
           paths:
-            - codeclimate/$CIRCLE_JOB.json
+            - codeclimate/*.json
 
   check-merge-to-enterprise:
     docker: