diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca11872..a4d59ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,20 +56,30 @@ before_script:
 
   # Not necessary, but just for surity
   - chmod +x ./gradlew
+cache:
+  key: ${CI_PROJECT_ID}
+  paths:
+  - .gradle/
 
 # Basic android and gradle stuff
 # Check linting
-build_debug:
+build_dev_debug:
   stage: build
   script:
-    - ./gradlew assembleDebug
+    - ./gradlew assembleDevDebug
+    - ./gradlew assembleDevDebugAndroidTest
+  only:
+    - dev
   artifacts:
     paths:
       - app/build/outputs/
 
 
-.test_lab_template: &test_lab_template_def
+
+instrumentation_test_dev_debug:
   stage: test
+  only:
+    - dev
   before_script:
     # Install Google Cloud SDK
     - wget --quiet --output-document=/tmp/google-cloud-sdk.tar.gz https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz
@@ -91,25 +101,13 @@ build_debug:
     - gcloud firebase test android models list
     - gcloud firebase test android versions list
 
+script:
+    # copy file to root and rename it for easier access
+    - cp app/build/outputs/apk/dev/debug/app-dev-debug.apk ./app.apk
+    - cp app/build/outputs/apk/androidTest/dev/debug/app-dev-debug-androidTest.apk ./app-test.apk
 
-  after_script:
-    - source /opt/google-cloud-sdk/path.bash.inc
-
-    # Iterate up to 10 possible test lab configurations and create CLI tool options
-    - for i in `seq 1 10`; do export CONFIG="TEST_LAB_DEVICE_CONFIGURATION_$i"; if [ -n "${!CONFIG}" ]; then export TEST_LAB_DEVICE_CONFIGURATIONS="$TEST_LAB_DEVICE_CONFIGURATIONS --device model=${!CONFIG} "; fi; done
-    
-    # Output for debug logging purpose only
-    - echo $TEST_LAB_DEVICE_CONFIGURATIONS
-    
-    # Run tests if there were any configured
-    - if [ -n "$TEST_LAB_DEVICE_CONFIGURATIONS" ]; then gcloud firebase test android run --type robo --app app.apk $TEST_LAB_DEVICE_CONFIGURATIONS --timeout 90s; fi
-    
-    # Warn if there were no configurations
-    - if [ -z "$TEST_LAB_DEVICE_CONFIGURATIONS" ]; then echo "NO FIREBASE TESTLAB CONFIGURATIONS!!!"; fi
-
-test_lab_debug:
-    <<: *test_lab_template_def
-    script:
-        - cp app/build/outputs/apk/debug/app-debug.apk ./app.apk
-    dependencies:
-        - build_debug
+    # deploy to gcloud and run instrumented test
+    - gcloud firebase test android run --type instrumentation --app app.apk --test app-test.apk --device model=Nexus6P,version=26,locale=en,orientation=portrait
+dependencies:
+    - build_dev_debug
+