diff --git a/tasks/workstation/linux/software/android.yml b/tasks/workstation/linux/software/android.yml
index 6daaf98..51618b6 100644
--- a/tasks/workstation/linux/software/android.yml
+++ b/tasks/workstation/linux/software/android.yml
@@ -17,6 +17,7 @@
     android_url: "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip"
     android_download_file: "{{ user_user.home }}/Downloads/android-cmdline-tools.tar.xz"
     android_sdk_location: "{{ user_user.home }}/SDKs/Android/Sdk"
+    android_report_file: "{{ user_user.home }}/Reports/{{ ansible_hostname }}.sdk.android.txt"
 
 - name: Workstation | Linux | Software | Android | Facts [2/3]
   set_fact:
@@ -125,22 +126,48 @@
 - name: Workstation | Linux | Software | Android | Install Modules
   shell: "yes | {{ android_sdkmanager_final }} --install '{{ item }}' --sdk_root={{ android_sdk_location }}"
   loop:
-    # 34
-    - build-tools;34.0.0
-    - platforms;android-34
-    - sources;android-34
-    # 35
-    - build-tools;35.0.0
+    ### 36 ###
+    - build-tools;36.0.0
+    - platforms;android-36
+    - sources;android-36
+    ## Images
+    #- system-images;android-35;default;x86_64 # Does not exist yet
+    #- system-images;android-36;google_apis;x86_64 # Unsure whether to use this
+    - system-images;android-36;google_apis_playstore;x86_64
+    ### 35 ###
     - build-tools;35.0.1
     - platforms;android-35
     - sources;android-35
-    # Images
-    #- system-images;android-35;default;x86_64
-    #- system-images;android-35;aosp_atd;x86_64
+    ## Images
+    #- system-images;android-35;default;x86_64     # Already have Store version
+    #- system-images;android-35;google_apis;x86_64 # Already have Store version
     - system-images;android-35;google_apis_playstore;x86_64
   become_user: "{{ user }}"
   when: coding == true
 
+# Remove any versions which used to be part of this script and no longer used.
+- name: Workstation | Linux | Software | Android | Remove Modules
+  shell: "yes | {{ android_sdkmanager_final }} --uninstall '{{ item }}' --sdk_root={{ android_sdk_location }}"
+  loop:
+    ### 35 ###
+    - build-tools;35.0.0
+    ## Images
+    - system-images;android-35;aosp_atd;x86_64 # Automated Test Device, unnecessary.
+    ### 34 ###
+    - build-tools;34.0.0
+    - platforms;android-34
+    - sources;android-34
+  become_user: "{{ user }}"
+  when: coding == true
+
+# Report the currently installed packges.
+- name: Workstation | Linux | Software | Android | Report Modules
+  shell: "{{ android_sdkmanager_final }} --list_installed --sdk_root={{ android_sdk_location }} > {{ android_report_file }}"
+  become_user: "{{ user }}"
+  when: coding == true
+
+## Flutter and Licenses ##
+
 - name: Workstation | Linux | Software | Android | Inform Flutter
   shell: "{{ flutter }} config --android-sdk={{ android_sdk_location }}"
   become_user: "{{ user }}"