diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..256b3b882
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,36 @@
+version: 2
+
+jobs:
+  build:
+    docker:
+      - image: circleci/android:api-26-alpha
+
+    working_directory: ~/AntennaPod
+
+    environment:
+      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"'
+      _JAVA_OPTIONS: "-Xms256m -Xmx1280m"
+
+    steps:
+      - checkout
+      
+      - restore_cache:
+          keys:
+            - v1-android-{{ checksum "build.gradle" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-android-
+
+      - run:
+          command: ./gradlew assembleDebug -PdisablePreDex
+          no_output_timeout: 1800
+      
+      - store_artifacts:
+          path: app/build/outputs/apk
+          destination: apks
+
+      - save_cache:
+          paths:
+            - ~/.android
+            - ~/.gradle
+            - ~/android
+          key: v1-android-{{ checksum "build.gradle" }}
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 52ce389d4..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-general:
-  artifacts:
-    - app/build/outputs/apk
-machine:
-  environment:
-    GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"'
-    _JAVA_OPTIONS: "-Xms256m -Xmx1280m -XX:MaxPermSize=350m"
-  java:
-    version: oraclejdk8
-dependencies:
-  cache_directories:
-    - ~/.android
-    - ~/android
-  pre:
-    - echo y | android update sdk --no-ui --all --filter "tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-26"
-    - echo y | android update sdk --no-ui --all --filter "build-tools-27.0.3"
-  override:
-    - echo override dependencies
-
-test:
-  override:
-    - ./gradlew assembleDebug -PdisablePreDex:
-        timeout: 1800