diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6485e60..30b4ea1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,14 +1,35 @@
 version: 2.1
-
-orbs:
- android: circleci/android@0.2.0
-
 jobs:
   build:
-    executor: android/android
-        
+    working_directory: ~/code
+    docker:
+      - image: circleci/android:api-29
+    environment:
+      - JVM_OPTS: -Xmx3200m
     steps:
       - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
       - run:
-          command: ./gradlew build
-
+          name: Chmod permissions
+          command: sudo chmod +x ./gradlew
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+      - run:
+          name: Run Tests
+          command: ./gradlew lint test
+      - store_artifacts:
+          path: app/build/reports
+          destination: reports
+      - store_test_results:
+          path: app/build/test-results
+workflows:
+  version: 2
+  workflow:
+    jobs:
+      - build