diff --git a/taskcluster/android-cache-armeabi-v7a-android-24.yml b/taskcluster/android-cache-armeabi-v7a-android-24.yml
index 3536ab3f..4c686739 100644
--- a/taskcluster/android-cache-armeabi-v7a-android-24.yml
+++ b/taskcluster/android-cache-armeabi-v7a-android-24.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.armeabi_v7a.android_24.url}
     artifact_namespace: ${system.android_cache.armeabi_v7a.android_24.namespace}
   scripts:
-    build: "taskcluster/android_cache-build.sh armeabi-v7a android-24"
+    build: "taskcluster/android_cache-build.sh armeabi-v7a android-24 default"
     package: "taskcluster/android_cache-package.sh"
   metadata:
     name: "Builds Android cache armeabi-v7a / android-24"
diff --git a/taskcluster/android_cache-build.sh b/taskcluster/android_cache-build.sh
index c22ece47..b1e1b843 100755
--- a/taskcluster/android_cache-build.sh
+++ b/taskcluster/android_cache-build.sh
@@ -6,6 +6,7 @@ source $(dirname "$0")/tc-tests-utils.sh
 
 arm_flavor=$1
 api_level=$2
+api_kind=$3
 
 export ANDROID_HOME=${ANDROID_SDK_HOME}
 
@@ -17,5 +18,5 @@ android_install_sdk
 android_install_sdk_platform "android-27"
 
 if [ "${arm_flavor}" != "sdk" ]; then
-  android_setup_emulator "${arm_flavor}" "${api_level}"
+  android_setup_emulator "${arm_flavor}" "${api_level}" "${api_kind}"
 fi;
diff --git a/taskcluster/tc-android-utils.sh b/taskcluster/tc-android-utils.sh
index a71edfb3..3bf66927 100755
--- a/taskcluster/tc-android-utils.sh
+++ b/taskcluster/tc-android-utils.sh
@@ -112,6 +112,11 @@ android_setup_emulator()
 
   local _flavor=$1
   local _api_level=${2:-android-25}
+  local _api_kind=${3:-google_apis}
+
+  if [ -z "${_api_kind}" ]; then
+    _api_kind="google_apis"
+  fi
 
   export PATH=${ANDROID_SDK_HOME}/tools/bin/:${ANDROID_SDK_HOME}/platform-tools/:$PATH
   export DS_BINARY_PREFIX="adb shell LD_LIBRARY_PATH=${ANDROID_TMP_DIR}/ds/ ${ANDROID_TMP_DIR}/ds/"
@@ -123,11 +128,11 @@ android_setup_emulator()
   android_install_sdk_platform "${_api_level}"
 
   # Same, yes in case of license
-  yes | sdkmanager --install "system-images;${_api_level};google_apis;${_flavor}"
+  yes | sdkmanager --install "system-images;${_api_level};${_api_kind};${_flavor}"
 
   android_sdk_accept_licenses
 
-  avdmanager create avd --name "${_flavor}-ds-pixel-${_api_level}" --device 17 --package "system-images;${_api_level};google_apis;${_flavor}"
+  avdmanager create avd --name "${_flavor}-ds-pixel-${_api_level}" --device 17 --package "system-images;${_api_level};${_api_kind};${_flavor}"
 }
 
 android_start_emulator()