diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dc2977..066503d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,12 +25,14 @@ build_debug:
     - apt install python2.7 python-pip -y
     - apt-get install wget
 
+     
     # 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
     - mkdir -p /opt
     - tar zxf /tmp/google-cloud-sdk.tar.gz --directory /opt
     - /opt/google-cloud-sdk/install.sh --quiet
     - source /opt/google-cloud-sdk/path.bash.inc
+
     # Setup and configure the project
     - gcloud components update
     - gcloud config set project $PROJECT_ID
@@ -38,29 +40,12 @@ build_debug:
     # Activate cloud credentials
     - echo $SERVICE_ACCOUNT > /tmp/service-account.json
     - gcloud auth activate-service-account --key-file /tmp/service-account.json
-    # List available options for logging purpose only (so that we can review available options)
-    - 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/debug/app-debug.apk ./app.apk
+    - cp app/build/outputs/apk/androidTest/debug/app-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/autopizza/debug/app-autopizza-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