diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 095a504..a10a5c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,69 +1,72 @@
-image: jangrewe/gitlab-ci-android
- 
-stages:
-  - build
-  - test
- 
-before_script:
-- export GRADLE_USER_HOME=$(pwd)/.gradle
-- chmod +x ./gradlew
- 
-build_debug:
-  stage: build
-  script:
-    - ./gradlew assembleDebug
-  artifacts:
-    paths:
-      - app/build/outputs/
- 
+# 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: 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
+
+
 .test_lab_template: &test_lab_template_def
   stage: test
   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
-    - curl https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz --output /tmp/google-cloud-sdk.tar.gz
+    - 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
-    - echo $GCLOUD_PROJECT_ID
+    - 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
- 
- 
+
+
   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
+
+