diff --git a/.circleci/config.yml b/.circleci/config.yml
index 92ceaebe..6f6a7c88 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,25 +2,23 @@ version: 2.0
 
 jobs:
     build:
-        docker:
-          - image: circleci/openjdk:9-jdk-sid-node-browsers
+        machine: true
         steps:
             - checkout
             - restore_cache:
-              keys:
-              - gradle-{{ checksum "build.gradle" }}
+                keys:
+                    - gradle-{{ checksum "build.gradle" }}
             - run: ./gradlew composeUp
-            - run: ./gradlew assemble
-            - run: ./gradlew test
+            - run: ./gradlew build
             - save_cache:
-              paths:
-              - ~/.gradle
-              key: gradle-{{ checksum "build.gradle" }}
+                paths:
+                    - ~/.gradle
+                key: gradle-{{ checksum "build.gradle" }}
             - store_artifacts:
-              path: build/distributions
-              destination: distributions
+                path: build/distributions
+                destination: distributions
             - store_artifacts:
-              path: build/libs
-              destination: libs
+                path: build/libs
+                destination: libs
             - store_test_results:
-              path: build/test-results/**/*.xml
+                path: build/test-results/**/*.xml