diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac229ef..94754d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,37 @@
-# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny
-# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template.
+image: jangrewe/gitlab-ci-android
 
-image: openjdk:8-jdk
+stages:
+  - build
+  - test
 
-variables:
-
-  # ANDROID_COMPILE_SDK is the version of Android you're compiling with.
-  # It should match compileSdkVersion.
-  ANDROID_COMPILE_SDK: "29"
-
-  # ANDROID_BUILD_TOOLS is the version of the Android build tools you are using.
-  # It should match buildToolsVersion.
-  ANDROID_BUILD_TOOLS: "29.0.3"
-
-  # It's what version of the command line tools we're going to download from the official site.
-  # Official Site-> https://developer.android.com/studio/index.html
-  # There, look down below at the cli tools only, sdk tools package is of format:
-  #        commandlinetools-os_type-ANDROID_SDK_TOOLS_latest.zip
-  # when the script was last modified for latest compileSdkVersion, it was which is written down below
-  ANDROID_SDK_TOOLS: "6514223"
-
-# Packages installation before running script
+before_script:
+- export GRADLE_USER_HOME=$(pwd)/.gradle
+- chmod +x ./gradlew
 
 
-.test_lab_template: &test_lab_template_def
+
+build_dev_debug:
+  stage: build
+  script:
+    - ./gradlew assembleDevDebug
+    - ./gradlew assembleDevDebugAndroidTest
+  only:
+    - dev
+  artifacts:
+    paths:
+      - app/build/outputs/
+
+instrumentation_test_dev_debug:
   stage: test
+  only:
+    - dev
   before_script:
+    # Preparing wget
+    - apt-get update
+    - apt-get upgrade -y
+    - 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
@@ -35,18 +41,11 @@ variables:
 
     # Setup and configure the project
     - gcloud components update
-    - echo $GCLOUD_PROJECT_ID 
     - gcloud config set project $GCLOUD_PROJECT_ID
 
     # 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/dev/debug/app-dev-debug.apk ./app.apk