diff --git a/.circleci/config.yml b/.circleci/config.yml
index 17ec763..c19b50d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,24 +1,24 @@
 version: 2
 jobs:
   build:
-    docker:
-      - image: springcloud/pipeline-base
+    machine:
+      image: ubuntu-1604:202007-01
     environment:
       _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
       TERM: dumb
-      WITH_RABBIT: no
+      CACHE_VERSION: 2
     branches:
       ignore:
         - gh-pages # list of branches to ignore
     steps:
       - checkout
       - restore_cache:
-          key: sc-sleuth-{{ .Branch }}
+          key: sc-core-tests-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}
       - run:
           name: "Download dependencies"
           command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
       - save_cache:
-          key: sc-sleuth-{{ .Branch }}
+          key: sc-core-tests-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}
           paths:
             - ~/.m2
       - run:
@@ -28,15 +28,16 @@ jobs:
           name: "Aggregate test results"
           when: always
           command: |
-            mkdir -p $CIRCLE_TEST_REPORTS/junit/
-            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+            mkdir -p ~/junit/
+            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \;
             bash <(curl -s https://codecov.io/bash)
       - store_artifacts:
-          path: /junit/
+          path: ~/junit/
           destination: artifacts
       - store_test_results:
-          path: /junit/
+          path: ~/junit/
           destination: testartifacts
+
 notify:
   webhooks:
     # A list of hook hashes, containing the url field