diff --git a/.circleci/config.yml b/.circleci/config.yml
index b544c67ad..3fbbaae46 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,41 +9,44 @@ jobs:
         steps:
             - checkout
             - restore_cache:
-                    keys:
+                keys:
                     - authmereloaded-{{ checksum "pom.xml" }}
                     - authmereloaded-
             - run: mvn -T 2 dependency:go-offline
             - save_cache:
-                    paths:
-                        - ~/.m2
-                    key: authmereloaded-{{ checksum "pom.xml" }}
+                paths:
+                    - ~/.m2
+                key: authmereloaded-{{ checksum "pom.xml" }}
             - run: mvn -T 2 package
             - store_test_results:
-                    path: target/surefire-reports
+                path: target/surefire-reports
             - store_artifacts:
-                    path: target/*.jar
-    build_and_test_jdk9:
-        working_directory: ~/authmereloaded-jdk9
+                path: target/*.jar
+    build_and_test_jdk10:
+        working_directory: ~/authmereloaded-jdk10
         docker:
-            - image: circleci/openjdk:9-jdk
+            - image: circleci/openjdk:10-jdk
         environment:
-                MAVEN_OPTS: -Xmx2048m
+            MAVEN_OPTS: -Xmx2048m
         steps:
             - checkout
             - restore_cache:
-                    key: authmereloaded-{{ checksum "pom.xml" }}
+                keys:
+                    - authmereloaded-{{ checksum "pom.xml" }}
+                    - authmereloaded-
             - run: mvn -T 2 dependency:go-offline
             - save_cache:
-                    paths:
-                        - ~/.m2
-                    key: authmereloaded-{{ checksum "pom.xml" }}
+                paths:
+                    - ~/.m2
+                key: authmereloaded-{{ checksum "pom.xml" }}
             - run: mvn -T 2 package
             - store_test_results:
-                    path: target/surefire-reports
-            - run: cp ./target/*.jar $CIRCLE_ARTIFACTS
+                path: target/surefire-reports
+            - store_artifacts:
+                path: target/*.jar
 workflows:
     version: 2
     build_and_test:
         jobs:
             - build_and_test_jdk8
-            - build_and_test_jdk9
+            - build_and_test_jdk10