diff --git a/tasks/workstation/linux/software/android.yml b/tasks/workstation/linux/software/android.yml
index d787c20..5722b0e 100644
--- a/tasks/workstation/linux/software/android.yml
+++ b/tasks/workstation/linux/software/android.yml
@@ -167,16 +167,19 @@
     - build-tools;36.0.0
     - platforms;android-36
     - sources;android-36
-    ## Images
-    #- system-images;android-35;default;x86_64 # Does not exist yet
+    # Images
+    #- system-images;android-35;default;x86_64 # TODO: Switch once it exists.
     - system-images;android-36;google_apis_playstore;x86_64
     ### 35 ###
-    - build-tools;35.0.1
     - platforms;android-35
     - sources;android-35
-    ## Images
+    # Images
     - system-images;android-35;default;x86_64
-    - system-images;android-35;google_apis_playstore;x86_64
+    ### 16 ###
+    - platforms;android-16
+    - sources;android-16
+    # Images
+    - system-images;android-16;default;x86
   become_user: "{{ user }}"
   when: coding == true
 
@@ -185,17 +188,30 @@
   shell: "yes | {{ android_sdkmanager_final }} --uninstall '{{ item }}' --sdk_root={{ android_sdk_location }}"
   loop:
     ### 36 ###
-    ## Images
+    # Images
     - system-images;android-36;google_apis;x86_64
     ### 35 ###
     - build-tools;35.0.0
-    ## Images
-    - system-images;android-35;aosp_atd;x86_64 # Automated Test Device, unnecessary.
+    - build-tools;35.0.1
+    # Images
+    - system-images;android-35;aosp_atd;x86_64 # ATD = Automated Test Device
     - system-images;android-35;google_apis;x86_64
+    - system-images;android-35;google_apis_playstore;x86_64
     ### 34 ###
     - build-tools;34.0.0
     - platforms;android-34
     - sources;android-34
+    # Images
+    - system-images;android-34;google_apis;x86_64
+    - system-images;android-34;google_apis_playstore;x86_64
+    ### 16 ###
+    # Images
+    - system-images;android-16;google_apis;x86
+    ### 15 ###
+    - platforms;android-15
+    - sources;android-15
+    # Images
+    - system-images;android-15;default;x86 # Not working in Android AVDs
   become_user: "{{ user }}"
   when: coding == true