diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 488be5b4d..123aad758 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -82,12 +82,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35]
+        version: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, "36.0-CANARY"]
         type: [""]
         include:
-          - version: 36
-            type: "google_apis"
-          - version: 36
+          - version: "36.0-CANARY"
             type: "google_apis_ps16k"
 
     steps:
diff --git a/scripts/avd.sh b/scripts/avd.sh
index 78db799ea..628775a61 100755
--- a/scripts/avd.sh
+++ b/scripts/avd.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -e
+shopt -s extglob
 . scripts/test_common.sh
 
 emu_port=5682
@@ -88,11 +89,12 @@ resolve_vars() {
   # Determine API level
   local api
   case $ver in
-    [0-9]*) api=$ver ;;
+    +([0-9])) api=$ver ;;
     TiramisuPrivacySandbox) api=33 ;;
     UpsideDownCakePrivacySandbox) api=34 ;;
     VanillaIceCream) api=35 ;;
     Baklava) api=36 ;;
+    36*CANARY) api=36 ;;
     *)
       print_error "! Unknown system image version '$ver'"
       exit 1
@@ -131,11 +133,15 @@ resolve_vars() {
   dump_vars $arg_list
 }
 
-setup_emu() {
+dl_emu() {
   local avd_pkg=$1
-
   yes | "$sdk" --licenses > /dev/null 2>&1
   "$sdk" --channel=3 platform-tools emulator $avd_pkg
+}
+
+setup_emu() {
+  local avd_pkg=$1
+  dl_emu $avd_pkg
   echo no | "$avd" create avd -f -n test -k $avd_pkg
 }
 
@@ -211,9 +217,17 @@ run_main() {
   local avd_pkg
   eval $(resolve_vars "emu_args avd_pkg" $1 $2)
   setup_emu "$avd_pkg"
+  print_title "* Launching $avd_pkg"
   "$emu" @test $emu_args 2>/dev/null
 }
 
+dl_main() {
+  local avd_pkg
+  eval $(resolve_vars "avd_pkg" $1 $2)
+  print_title "* Downloading $avd_pkg"
+  dl_emu "$avd_pkg"
+}
+
 case "$1" in
   test )
     shift
@@ -227,6 +241,10 @@ case "$1" in
     trap cleanup EXIT
     run_main "$@"
     ;;
+  dl )
+    shift
+    dl_main "$@"
+    ;;
   * )
     print_error "Unknown argument '$1'"
     exit 1