diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94754d7..1c788ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,37 +1,80 @@
-image: jangrewe/gitlab-ci-android
+# 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.
 
-stages:
-  - build
-  - test
+image: openjdk:8-jdk
 
+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
+  - apt-get --quiet update --yes
+  - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
 
+  # Setup path as android_home for moving/exporting the downloaded sdk into it
+  - export ANDROID_HOME="${PWD}/android-home"
+  # Create a new directory at specified location
+  - install -d $ANDROID_HOME
+  # Here we are installing androidSDK tools from official source,
+  # (the key thing here is the url from where you are downloading these sdk tool for command line, so please do note this url pattern there and here as well)
+  # after that unzipping those tools and
+  # then running a series of SDK manager commands to install necessary android SDK packages that'll allow the app to build
+  - wget --output-document=$ANDROID_HOME/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip
+  # move to the archive at ANDROID_HOME
+  - pushd $ANDROID_HOME
+  - unzip -d cmdline-tools cmdline-tools.zip
+  - popd
+  - export PATH=$PATH:${ANDROID_HOME}/cmdline-tools/tools/bin/
 
+  # Nothing fancy here, just checking sdkManager version
+  - sdkmanager --version
 
-build_dev_debug:
+  # use yes to accept all licenses
+  - yes | sdkmanager --sdk_root=${ANDROID_HOME} --licenses || true
+  - sdkmanager --sdk_root=${ANDROID_HOME} "platforms;android-${ANDROID_COMPILE_SDK}"
+  - sdkmanager --sdk_root=${ANDROID_HOME} "platform-tools"
+  - sdkmanager --sdk_root=${ANDROID_HOME} "build-tools;${ANDROID_BUILD_TOOLS}"
+
+  # Not necessary, but just for surity
+  - chmod +x ./gradlew
+
+# Basic android and gradle stuff
+# Check linting
+lintDebug:
+  interruptible: true
   stage: build
   script:
-    - ./gradlew assembleDevDebug
-    - ./gradlew assembleDevDebugAndroidTest
-  only:
-    - dev
+    - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint
+
+# Make Project
+assembleDebug:
+  interruptible: true
+  stage: build
+  script:
+    - ./gradlew assembleDebug
   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
 
+
+.test_lab_template: &test_lab_template_def
+  stage: test
+  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
     - mkdir -p /opt
@@ -41,17 +84,36 @@ instrumentation_test_dev_debug:
 
     # 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
-  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
 
-    # 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
+    # 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
+
+
+  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_test_debug:
+  <<: *test_lab_template_def
+  only:
+    - test-lab
+  script:
+    - cp app/build/outputs/apk/app-debug.apk ./app.apk