diff --git a/AndroidAzurePipelines/pipelines_android.yml b/AndroidAzurePipelines/pipelines_android.yml
index 75f2fc3..1850a24 100644
--- a/AndroidAzurePipelines/pipelines_android.yml
+++ b/AndroidAzurePipelines/pipelines_android.yml
@@ -1,20 +1,53 @@
-# Android
-# Build your Android project with Gradle.
-# Add steps that test, sign, and distribute the APK, save build artifacts, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/languages/android
+parameters:
+  - name: BuildType
+    displayName: 'Select your build type'
+    default: debug
+    values:
+      - debug
+      - staging
+      - release
+
+  - name: OS
+    displayName: Operating System
+    type: string
+    default: windows-latest
+    values:
+      - windows-latest
+      - vs2017-win2016
+      - ubuntu-latest
+      - ubuntu-16.04
+      - macOS-latest
+      - macOS-10.14
 
 trigger:
   - main
 
-pool:
-  vmImage: 'macos-latest'
 
-steps:
-  - task: Gradle@2
-    inputs:
-      workingDirectory: ''
-      gradleWrapperFile: 'gradlew'
-      gradleOptions: '-Xmx3072m'
-      publishJUnitResults: false
-      testResultsFiles: '**/TEST-*.xml'
-      tasks: 'assembleDebug'
+stages:
+  - stage: 
+    displayName: 'Android ${{ parameters.BuildType }} build'
+    jobs:
+      - job: 
+        workspace:
+          clean: all      
+        pool:
+          vmImage: ${{ parameters.OS }}
+
+        steps:
+          - task: Gradle@2
+            displayName: 'Building Project'
+            inputs:
+              workingDirectory: ''
+              gradleWrapperFile: 'gradlew'
+              gradleOptions: '-Xmx3072m'
+              publishJUnitResults: false
+              testRunTitle: 'InvestorCentreAndroidTest'
+              testResultsFiles: '**/TEST-*.xml'
+              tasks: assemble${{ parameters.BuildType }}
+              codeCoverageToolOption: 'None'
+              javaHomeOption: 'JDKVersion'
+              jdkVersionOption: 'default'
+              jdkArchitectureOption: 'x64'
+              checkStyleRunAnalysis: false
+              findBugsRunAnalysis: false
+