diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1ad78c54..d9b823fd9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,6 +69,8 @@ errorprone:
 
     - if [[ "$AVD_ARCH" != arm* ]]; then
           set -x; echo y | sdkmanager "emulator" > /dev/null; set +x;
+      elif [[ "$AVD_SDK" == Q ]]; then
+          set -x; echo y | sdkmanager --channel=2 "emulator" > /dev/null; set +x;
       fi
 
     - alias sdkmanager