diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3b31aa808..5167f588a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -88,9 +88,9 @@ jobs:
         version: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35]
         type: [""]
         include:
-          - version: "Baklava"
+          - version: 36
             type: "google_apis"
-          - version: "Baklava"
+          - version: 36
             type: "google_apis_ps16k"
 
     steps:
diff --git a/scripts/avd_test.sh b/scripts/avd_test.sh
index a43151f7e..6bdea40da 100755
--- a/scripts/avd_test.sh
+++ b/scripts/avd_test.sh
@@ -205,9 +205,9 @@ else
     test_main $api
   done
   # Android 16 Beta
-  test_main Baklava google_apis
+  test_main 36 google_apis
   # Run 16k page tests
-  test_main Baklava google_apis_ps16k
+  test_main 36 google_apis_ps16k
 fi
 
 "$avd" delete avd -n test