diff --git a/tasks/workstation/linux/software/android.yml b/tasks/workstation/linux/software/android.yml
index d881d71..5303a11 100644
--- a/tasks/workstation/linux/software/android.yml
+++ b/tasks/workstation/linux/software/android.yml
@@ -81,9 +81,10 @@
 - name: Workstation | Linux | Software | Android | Facts [Downloads]
   set_fact:
     android_downloads_required:
-      ### 37 ###
-      - build-tools/37.0.0
       ### 36 ###
+      # Flutter still uses 36.0.0
+      - build-tools/36.0.0
+      # Stick with 36, 37 not yet ready according to Android Studio
       - platforms/android-36
       - sources/android-36
       - system-images/android-36/default/x86_64
@@ -92,12 +93,15 @@
       ### 16 ###
       - system-images/android-16/default/x86
     android_downloads_additional:
+      ### 37 ###
+      - build-tools/37.0.0
+      - platforms/android-37.0
+      - sources/android-37.0
       ### 30 ###
       - system-images/android-30/default/x86_64
     android_downloads_unused:
       ### 37 ###
       ### 36 ###
-      - build-tools/36.0.0
       - system-images/android-36/google_apis_playstore/x86_64
       - system-images/android-36/google_apis/x86_64
       ### 35 ###