From 040f5eb2a3ccde75484aba510cdba0479f35bac6 Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx@lissyx.dyndns.org>
Date: Mon, 3 Aug 2020 17:18:11 +0200
Subject: [PATCH] Fix #3181: Use finer-grained gcp workers

---
 .taskcluster.yml                              |   2 +-
 taskcluster/.build.yml                        |   1 +
 taskcluster/.shared.yml                       | 105 ++++++++++--------
 taskcluster/android-arm64-cpu-opt.yml         |   1 +
 taskcluster/android-armv7-cpu-opt.yml         |   1 +
 .../android-cache-arm64-v8a-android-24.yml    |   1 +
 .../android-cache-arm64-v8a-android-25.yml    |   1 +
 .../android-cache-armeabi-v7a-android-24.yml  |   1 +
 .../android-cache-armeabi-v7a-android-25.yml  |   1 +
 taskcluster/android-cache-sdk-android-27.yml  |   1 +
 .../android-cache-x86_64-android-24.yml       |   1 +
 .../android-cache-x86_64-android-25.yml       |   1 +
 .../android-cache-x86_64-android-26.yml       |   1 +
 .../android-cache-x86_64-android-28.yml       |   1 +
 .../android-cache-x86_64-android-29.yml       |   1 +
 .../android-cache-x86_64-android-30.yml       |   1 +
 taskcluster/android-java-opt.yml              |   1 +
 taskcluster/android-x86_64-cpu-opt.yml        |   1 +
 taskcluster/docker-build-base.tyml            |   2 +-
 taskcluster/docker-image-build.yml            |   1 +
 taskcluster/docker-image-train.yml            |   1 +
 taskcluster/docs.tyml                         |   2 +-
 taskcluster/docs.yml                          |   1 +
 taskcluster/examples-base.tyml                |   2 +-
 .../examples-ffmpeg_vad_streaming-node10.yml  |   1 +
 .../examples-ffmpeg_vad_streaming-node12.yml  |   1 +
 .../examples-mic_vad_streaming-py36.yml       |   1 +
 .../examples-mic_vad_streaming-py37.yml       |   1 +
 taskcluster/examples-nodejs_wav-node10.yml    |   1 +
 taskcluster/examples-nodejs_wav-node12.yml    |   1 +
 taskcluster/examples-vad_transcriber-py35.yml |   1 +
 taskcluster/examples-vad_transcriber-py36.yml |   1 +
 taskcluster/examples-vad_transcriber-py37.yml |   1 +
 taskcluster/examples-vad_transcriber-py38.yml |   1 +
 .../generic_tc_caching-linux-opt-base.tyml    |   2 +-
 taskcluster/gradle-cache.yml                  |   1 +
 taskcluster/linux-amd64-cpu-opt.yml           |   1 +
 taskcluster/linux-amd64-ctc-opt.yml           |   1 +
 taskcluster/linux-amd64-gpu-opt.yml           |   1 +
 taskcluster/linux-amd64-tflite-opt.yml        |   1 +
 taskcluster/linux-arm64-cpu-opt.yml           |   1 +
 taskcluster/linux-opt-base.tyml               |   2 +-
 taskcluster/linux-rpi3-cpu-opt.yml            |   1 +
 taskcluster/node-gyp-cache.yml                |   1 +
 taskcluster/node-package-cpu.yml              |   1 +
 taskcluster/node-package-gpu.yml              |   1 +
 taskcluster/node-package-opt-base.tyml        |   2 +-
 taskcluster/node-package-tflite.yml           |   1 +
 taskcluster/pyenv-linux-amd64.yml             |   1 +
 taskcluster/swig-linux-amd64.yml              |   1 +
 taskcluster/swig-win-amd64.yml                |   1 +
 taskcluster/test-android-opt-base.tyml        |   2 +-
 .../test-apk-android-24-x86_64-opt.yml        |   1 +
 .../test-apk-android-25-x86_64-opt.yml        |   1 +
 .../test-apk-android-26-x86_64-opt.yml        |   1 +
 .../test-apk-android-28-x86_64-opt.yml        |   1 +
 .../test-apk-android-29-x86_64-opt.yml        |   1 +
 .../test-apk-android-30-x86_64-opt.yml        |   1 +
 ...st-augmentations-linux-amd64-py36m-opt.yml |   1 +
 taskcluster/test-cpp-android-24-arm64-opt.yml |   1 +
 taskcluster/test-cpp-android-24-armv7-opt.yml |   1 +
 taskcluster/test-cpp-android-25-arm64-opt.yml |   1 +
 taskcluster/test-cpp-android-25-armv7-opt.yml |   1 +
 .../test-cpp-linux-amd64-prod_pbmodel-opt.yml |   1 +
 taskcluster/test-cpp_16k-linux-amd64-opt.yml  |   1 +
 .../test-cpp_16k_tflite-linux-amd64-opt.yml   |   1 +
 taskcluster/test-cpp_8k-linux-amd64-opt.yml   |   1 +
 .../test-cpp_8k_tflite-linux-amd64-opt.yml    |   1 +
 .../test-cpp_tflite-linux-amd64-prod-opt.yml  |   1 +
 ...st-electronjs_v5.0_16k-linux-amd64-opt.yml |   1 +
 ...est-electronjs_v5.0_8k-linux-amd64-opt.yml |   1 +
 ...st-electronjs_v6.0_16k-linux-amd64-opt.yml |   1 +
 ...est-electronjs_v6.0_8k-linux-amd64-opt.yml |   1 +
 ...st-electronjs_v6.1_16k-linux-amd64-opt.yml |   1 +
 ...est-electronjs_v6.1_8k-linux-amd64-opt.yml |   1 +
 ...st-electronjs_v7.0_16k-linux-amd64-opt.yml |   1 +
 ...est-electronjs_v7.0_8k-linux-amd64-opt.yml |   1 +
 ...st-electronjs_v7.1_16k-linux-amd64-opt.yml |   1 +
 ...est-electronjs_v7.1_8k-linux-amd64-opt.yml |   1 +
 ...st-electronjs_v8.0_16k-linux-amd64-opt.yml |   1 +
 ...est-electronjs_v8.0_8k-linux-amd64-opt.yml |   1 +
 ...st-electronjs_v9.0_16k-linux-amd64-opt.yml |   1 +
 ...est-electronjs_v9.0_8k-linux-amd64-opt.yml |   1 +
 ...st-electronjs_v9.1_16k-linux-amd64-opt.yml |   1 +
 ...est-electronjs_v9.1_8k-linux-amd64-opt.yml |   1 +
 ...-evaluate_tflite-linux-amd64-py36m-opt.yml |   1 +
 taskcluster/test-linux-opt-base.tyml          |   2 +-
 taskcluster/test-linux-opt-tag-base.tyml      |   2 +-
 .../test-nodejs_10x_16k-linux-amd64-opt.yml   |   1 +
 ...s_10x_16k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...js_10x_16k_tflite-linux-amd64-prod-opt.yml |   1 +
 .../test-nodejs_10x_8k-linux-amd64-opt.yml    |   1 +
 ...js_10x_8k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...ejs_10x_8k_tflite-linux-amd64-prod-opt.yml |   1 +
 .../test-nodejs_11x_16k-linux-amd64-opt.yml   |   1 +
 ...s_11x_16k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...js_11x_16k_tflite-linux-amd64-prod-opt.yml |   1 +
 .../test-nodejs_11x_8k-linux-amd64-opt.yml    |   1 +
 ...js_11x_8k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...ejs_11x_8k_tflite-linux-amd64-prod-opt.yml |   1 +
 .../test-nodejs_12x_16k-linux-amd64-opt.yml   |   1 +
 ...s_12x_16k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...js_12x_16k_tflite-linux-amd64-prod-opt.yml |   1 +
 .../test-nodejs_12x_8k-linux-amd64-opt.yml    |   1 +
 ...js_12x_8k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...ejs_12x_8k_tflite-linux-amd64-prod-opt.yml |   1 +
 .../test-nodejs_13x_16k-linux-amd64-opt.yml   |   1 +
 ...s_13x_16k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...s_13x_16k_multiarchpkg-linux-amd64-opt.yml |   1 +
 ...tiarchpkg-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ..._13x_16k_multiarchpkg-linux-tflite-opt.yml |   1 +
 ...js_13x_16k_tflite-linux-amd64-prod-opt.yml |   1 +
 .../test-nodejs_13x_8k-linux-amd64-opt.yml    |   1 +
 ...js_13x_8k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...js_13x_8k_multiarchpkg-linux-amd64-opt.yml |   1 +
 ...tiarchpkg-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...s_13x_8k_multiarchpkg-linux-tflite-opt.yml |   1 +
 ...ejs_13x_8k_tflite-linux-amd64-prod-opt.yml |   1 +
 .../test-nodejs_14x_16k-linux-amd64-opt.yml   |   1 +
 ...s_14x_16k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...s_14x_16k_multiarchpkg-linux-amd64-opt.yml |   1 +
 ...tiarchpkg-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ..._14x_16k_multiarchpkg-linux-tflite-opt.yml |   1 +
 ...js_14x_16k_tflite-linux-amd64-prod-opt.yml |   1 +
 .../test-nodejs_14x_8k-linux-amd64-opt.yml    |   1 +
 ...js_14x_8k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...js_14x_8k_multiarchpkg-linux-amd64-opt.yml |   1 +
 ...tiarchpkg-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...s_14x_8k_multiarchpkg-linux-tflite-opt.yml |   1 +
 ...ejs_14x_8k_tflite-linux-amd64-prod-opt.yml |   1 +
 .../test-python_35_16k-linux-amd64-opt.yml    |   1 +
 ...on_35_16k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 .../test-python_35_8k-linux-amd64-opt.yml     |   1 +
 ...hon_35_8k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...t-python_35_tflite_16k-linux-amd64-opt.yml |   1 +
 ...hon_35_tflite_16k-linux-amd64-prod-opt.yml |   1 +
 ...thon_35_tflite_8k-linux-amd64-prod-opt.yml |   1 +
 .../test-python_36_16k-linux-amd64-opt.yml    |   1 +
 ...on_36_16k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 .../test-python_36_8k-linux-amd64-opt.yml     |   1 +
 ...hon_36_8k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...t-python_36_tflite_16k-linux-amd64-opt.yml |   1 +
 ...hon_36_tflite_16k-linux-amd64-prod-opt.yml |   1 +
 ...thon_36_tflite_8k-linux-amd64-prod-opt.yml |   1 +
 .../test-python_37_16k-linux-amd64-opt.yml    |   1 +
 ...on_37_16k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 .../test-python_37_8k-linux-amd64-opt.yml     |   1 +
 ...hon_37_8k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...t-python_37_tflite_16k-linux-amd64-opt.yml |   1 +
 ...hon_37_tflite_16k-linux-amd64-prod-opt.yml |   1 +
 ...thon_37_tflite_8k-linux-amd64-prod-opt.yml |   1 +
 .../test-python_38_16k-linux-amd64-opt.yml    |   1 +
 ...on_38_16k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 .../test-python_38_8k-linux-amd64-opt.yml     |   1 +
 ...hon_38_8k-linux-amd64-prod_pbmodel-opt.yml |   1 +
 ...t-python_38_tflite_16k-linux-amd64-opt.yml |   1 +
 ...hon_38_tflite_16k-linux-amd64-prod-opt.yml |   1 +
 ...thon_38_tflite_8k-linux-amd64-prod-opt.yml |   1 +
 ...gleshotinference-linux-amd64-py36m-opt.yml |   1 +
 ...aining-extra_16k-linux-amd64-py35m-opt.yml |   1 +
 ...aining-extra_16k-linux-amd64-py36m-opt.yml |   1 +
 ...aining-extra_16k-linux-amd64-py37m-opt.yml |   1 +
 ...raining-extra_8k-linux-amd64-py36m-opt.yml |   1 +
 ...raining-extra_8k-linux-amd64-py37m-opt.yml |   1 +
 ...raining-pypi_16k-linux-amd64-py35m-opt.yml |   1 +
 ...raining-pypi_16k-linux-amd64-py36m-opt.yml |   1 +
 ...raining-pypi_16k-linux-amd64-py37m-opt.yml |   1 +
 ...training-pypi_8k-linux-amd64-py36m-opt.yml |   1 +
 ...training-pypi_8k-linux-amd64-py37m-opt.yml |   1 +
 ...ing-unittests_8k-linux-amd64-py35m-opt.yml |  23 ++--
 ...ing-unittests_8k-linux-amd64-py36m-opt.yml |  23 ++--
 ...ing-unittests_8k-linux-amd64-py37m-opt.yml |  23 ++--
 ...est-training_16k-linux-amd64-py35m-opt.yml |   1 +
 ...est-training_16k-linux-amd64-py36m-opt.yml |   1 +
 ...est-training_16k-linux-amd64-py37m-opt.yml |   1 +
 ...test-training_8k-linux-amd64-py36m-opt.yml |   1 +
 ...test-training_8k-linux-amd64-py37m-opt.yml |   1 +
 .../test-transfer-linux-amd64-py36m-opt.yml   |   1 +
 taskcluster/tf_android-arm64-opt.yml          |   1 +
 taskcluster/tf_android-armv7-opt.yml          |   1 +
 taskcluster/tf_linux-amd64-cpu-opt.yml        |   1 +
 taskcluster/tf_linux-amd64-gpu-opt.yml        |   1 +
 taskcluster/tf_linux-arm64-cpu-opt.yml        |   1 +
 taskcluster/tf_linux-rpi3-cpu-opt.yml         |   1 +
 taskcluster/worker.cyml                       |   1 -
 185 files changed, 274 insertions(+), 91 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 9ed80334..ab816850 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -8,7 +8,7 @@ metadata:
   source: "{{ event.head.repo.url }}"  # the repo where the pr came from will be inserted here
 tasks:
   - provisionerId: "proj-deepspeech"
-    workerType: "ci"
+    workerType: "ci-decision-task"
     extra:
       github:
         env: true
diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml
index 416faec2..2a96f753 100644
--- a/taskcluster/.build.yml
+++ b/taskcluster/.build.yml
@@ -12,6 +12,7 @@ build:
   docker_image: "ubuntu:16.04"
   generic:
     workerType: 'ds-macos-light'
+  workerType: ''
   system_setup:
     >
       true
diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
index 87d8d7a6..c03daa63 100644
--- a/taskcluster/.shared.yml
+++ b/taskcluster/.shared.yml
@@ -63,8 +63,8 @@ nodejs:
     prep_14: '/usr/bin/wget.exe https://nodejs.org/dist/v14.3.0/node-v14.3.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v14.3.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v14.3.0-win-x64/:$PATH'
 system:
   node_gyp_cache:
-    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.node-gyp-cache.7/artifacts/public/node-gyp-cache.tar.gz'
-    namespace: 'project.deepspeech.node-gyp-cache.7'
+    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.node-gyp-cache.8/artifacts/public/node-gyp-cache.tar.gz'
+    namespace: 'project.deepspeech.node-gyp-cache.8'
   homebrew_builds:
     url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.homebrew_builds.8/artifacts/public/homebrew_builds.tar.gz'
     namespace: 'project.deepspeech.homebrew_builds.8'
@@ -74,51 +74,51 @@ system:
   android_cache:
     arm64_v8a:
       android_24:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.arm64-v8a.android-24.6/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.arm64-v8a.android-24.6'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.arm64-v8a.android-24.7/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.arm64-v8a.android-24.7'
       android_25:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.arm64-v8a.android-25.6/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.arm64-v8a.android-25.6'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.arm64-v8a.android-25.7/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.arm64-v8a.android-25.7'
     armeabi_v7a:
       android_24:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.armeabi-v7a.android-24.6/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.armeabi-v7a.android-24.6'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.armeabi-v7a.android-24.7/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.armeabi-v7a.android-24.7'
       android_25:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.armeabi-v7a.android-25.6/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.armeabi-v7a.android-25.6'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.armeabi-v7a.android-25.7/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.armeabi-v7a.android-25.7'
     x86_64:
       android_24:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-24.6/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.x86_64.android-24.6'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-24.7/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-24.7'
       android_25:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-25.6/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.x86_64.android-25.6'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-25.7/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-25.7'
       android_26:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-26.2/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.x86_64.android-26.2'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-26.3/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-26.3'
       android_27:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-27.2/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.x86_64.android-27.2'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-27.3/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-27.3'
       android_28:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-28.2/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.x86_64.android-28.2'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-28.3/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-28.3'
       android_29:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-29.2/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.x86_64.android-29.2'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-29.3/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-29.3'
       android_30:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-30.2/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.x86_64.android-30.2'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-30.3/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-30.3'
     sdk:
       android_27:
-        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.sdk.android-27.6/artifacts/public/android_cache.tar.gz'
-        namespace: 'project.deepspeech.android_cache.sdk.android-27.6'
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.sdk.android-27.7/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.sdk.android-27.7'
   gradle_cache:
-    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.gradle.6/artifacts/public/gradle.tar.gz'
-    namespace: 'project.deepspeech.gradle.6'
+    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.gradle.7/artifacts/public/gradle.tar.gz'
+    namespace: 'project.deepspeech.gradle.7'
   pyenv:
     linux:
-      url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.pyenv.linux.8/artifacts/public/pyenv.tar.gz'
-      namespace: 'project.deepspeech.pyenv.linux.8'
+      url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.pyenv.linux.9/artifacts/public/pyenv.tar.gz'
+      namespace: 'project.deepspeech.pyenv.linux.9'
     osx:
       url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.pyenv.osx.9/artifacts/public/pyenv.tar.gz'
       namespace: 'project.deepspeech.pyenv.osx.9'
@@ -127,39 +127,39 @@ system:
       namespace: 'project.deepspeech.pyenv.win.8'
   swig:
     repo: "https://github.com/lissyx/swig"
-    sha1: "b5fea54d39832d1d132d7dd921b69c0c2c9d5118"
+    sha1: "1a4c14945012f1282c2eddc174fb7674d5295de8"
   swig_build:
     linux:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.linux.amd64.b5fea54d39832d1d132d7dd921b69c0c2c9d5118/artifacts/public/ds-swig.tar.gz"
-      namespace: "project.deepspeech.swig.linux.amd64.b5fea54d39832d1d132d7dd921b69c0c2c9d5118"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.linux.amd64.1a4c14945012f1282c2eddc174fb7674d5295de8.0/artifacts/public/ds-swig.tar.gz"
+      namespace: "project.deepspeech.swig.linux.amd64.1a4c14945012f1282c2eddc174fb7674d5295de8.0"
     osx:
       url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.darwin.amd64.b5fea54d39832d1d132d7dd921b69c0c2c9d5118/artifacts/public/ds-swig.tar.gz"
       namespace: "project.deepspeech.swig.darwin.amd64.b5fea54d39832d1d132d7dd921b69c0c2c9d5118"
     win:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.win.amd64.b5fea54d39832d1d132d7dd921b69c0c2c9d5118/artifacts/public/ds-swig.tar.gz"
-      namespace: "project.deepspeech.swig.win.amd64.b5fea54d39832d1d132d7dd921b69c0c2c9d5118"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.win.amd64.1a4c14945012f1282c2eddc174fb7674d5295de8.0/artifacts/public/ds-swig.tar.gz"
+      namespace: "project.deepspeech.swig.win.amd64.1a4c14945012f1282c2eddc174fb7674d5295de8.0"
   tensorflow:
     linux_amd64_cpu:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.cpu/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.cpu"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.cpu/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.cpu"
     linux_amd64_cuda:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.cuda/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.cuda"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.cuda/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.cuda"
     linux_armv7:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.arm/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.arm"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.arm/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.arm"
     linux_arm64:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.arm64/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.arm64"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.arm64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.arm64"
     darwin_amd64:
       url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.osx/artifacts/public/home.tar.xz"
       namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.osx"
     android_arm64:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.android-arm64/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.android-arm64"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.android-arm64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.android-arm64"
     android_armv7:
-      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.android-armv7/artifacts/public/home.tar.xz"
-      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.android-armv7"
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.android-armv7/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.1.android-armv7"
     win_amd64_cpu:
       url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.win/artifacts/public/home.tar.xz"
       namespace: "project.deepspeech.tensorflow.pip.r2.2.1c1b2b9dd9ce767796a8414efbf65da1b67d1622.0.win"
@@ -181,3 +181,14 @@ system:
   msys2:
     url: 'https://github.com/msys2/msys2-installer/releases/download/2020-07-20/msys2-base-x86_64-20200720.tar.xz'
     sha: '24f0a7a3f499d9309bb55bcde5d34a08e752922c3bee9de3a33d2c40896a1496'
+docker:
+  smallTask: 'ci-decision-task'
+  smallTaskBeta: 'ci-decision-task-b'
+  tfBuild: 'ci-tf-build'
+  tfBuildBeta: 'ci-tf-build-b'
+  dsBuild: 'ci-ds-build'
+  dsBuildBeta: 'ci-ds-build-b'
+  dsTests: 'ci-ds-tests'
+  dsTestsBeta: 'ci-ds-tests-b'
+  dsHighMemTests: 'ci-ds-mem-tests'
+  dsHighMemTestsBeta: 'ci-ds-mem-tests-b'
diff --git a/taskcluster/android-arm64-cpu-opt.yml b/taskcluster/android-arm64-cpu-opt.yml
index 3a796e03..bbd53f7f 100644
--- a/taskcluster/android-arm64-cpu-opt.yml
+++ b/taskcluster/android-arm64-cpu-opt.yml
@@ -15,6 +15,7 @@ build:
     build: "taskcluster/android-build.sh arm64-v8a"
     package: "taskcluster/android-package.sh arm64-v8a"
   nc_asset_name: "native_client.arm64.cpu.android.tar.xz"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "DeepSpeech Android ARM64"
     description: "Building DeepSpeech for Android ARM64, optimized version"
diff --git a/taskcluster/android-armv7-cpu-opt.yml b/taskcluster/android-armv7-cpu-opt.yml
index 196f3e6d..b7f8b9ea 100644
--- a/taskcluster/android-armv7-cpu-opt.yml
+++ b/taskcluster/android-armv7-cpu-opt.yml
@@ -14,6 +14,7 @@ build:
     build: "taskcluster/android-build.sh armeabi-v7a"
     package: "taskcluster/android-package.sh armeabi-v7a"
   nc_asset_name: "native_client.armv7.cpu.android.tar.xz"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "DeepSpeech Android ARMv7"
     description: "Building DeepSpeech for Android ARMv7, optimized version"
diff --git a/taskcluster/android-cache-arm64-v8a-android-24.yml b/taskcluster/android-cache-arm64-v8a-android-24.yml
index d34bc190..c32d6ef7 100644
--- a/taskcluster/android-cache-arm64-v8a-android-24.yml
+++ b/taskcluster/android-cache-arm64-v8a-android-24.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh arm64-v8a android-24"
     package: "taskcluster/android_cache-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Android cache arm64-v8a / android-24"
     description: "Setup an Android SDK / emulator cache for Android arm64-v8a / android-24"
diff --git a/taskcluster/android-cache-arm64-v8a-android-25.yml b/taskcluster/android-cache-arm64-v8a-android-25.yml
index aed747d1..5b33db51 100644
--- a/taskcluster/android-cache-arm64-v8a-android-25.yml
+++ b/taskcluster/android-cache-arm64-v8a-android-25.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh arm64-v8a android-25"
     package: "taskcluster/android_cache-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Android cache arm64-v8a / android-25"
     description: "Setup an Android SDK / emulator cache for Android arm64-v8a / android-25"
diff --git a/taskcluster/android-cache-armeabi-v7a-android-24.yml b/taskcluster/android-cache-armeabi-v7a-android-24.yml
index f146272e..69b9ba7b 100644
--- a/taskcluster/android-cache-armeabi-v7a-android-24.yml
+++ b/taskcluster/android-cache-armeabi-v7a-android-24.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh armeabi-v7a android-24 default"
     package: "taskcluster/android_cache-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Android cache armeabi-v7a / android-24"
     description: "Setup an Android SDK / emulator cache for Android armeabi-v7a / android-24"
diff --git a/taskcluster/android-cache-armeabi-v7a-android-25.yml b/taskcluster/android-cache-armeabi-v7a-android-25.yml
index 56ff6452..15680405 100644
--- a/taskcluster/android-cache-armeabi-v7a-android-25.yml
+++ b/taskcluster/android-cache-armeabi-v7a-android-25.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh armeabi-v7a android-25"
     package: "taskcluster/android_cache-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Android cache armeabi-v7a / android-25"
     description: "Setup an Android SDK / emulator cache for Android armeabi-v7a / android-25"
diff --git a/taskcluster/android-cache-sdk-android-27.yml b/taskcluster/android-cache-sdk-android-27.yml
index d7b2c996..cc8ceafd 100644
--- a/taskcluster/android-cache-sdk-android-27.yml
+++ b/taskcluster/android-cache-sdk-android-27.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh sdk android-27"
     package: "taskcluster/android_cache-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Android cache sdk / android-27"
     description: "Setup an Android SDK / emulator cache for Android sdk / android-27"
diff --git a/taskcluster/android-cache-x86_64-android-24.yml b/taskcluster/android-cache-x86_64-android-24.yml
index 2d336e71..4bc37691 100644
--- a/taskcluster/android-cache-x86_64-android-24.yml
+++ b/taskcluster/android-cache-x86_64-android-24.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-24"
     package: "taskcluster/android_cache-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Android cache x86_64 / android-24"
     description: "Setup an Android SDK / emulator cache for Android x86_64 / android-24"
diff --git a/taskcluster/android-cache-x86_64-android-25.yml b/taskcluster/android-cache-x86_64-android-25.yml
index 50060d24..f86e9dc1 100644
--- a/taskcluster/android-cache-x86_64-android-25.yml
+++ b/taskcluster/android-cache-x86_64-android-25.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-25"
     package: "taskcluster/android_cache-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Android cache x86_64 / android-25"
     description: "Setup an Android SDK / emulator cache for Android / x86_64 android-25"
diff --git a/taskcluster/android-cache-x86_64-android-26.yml b/taskcluster/android-cache-x86_64-android-26.yml
index 4db61465..0ac5a35f 100644
--- a/taskcluster/android-cache-x86_64-android-26.yml
+++ b/taskcluster/android-cache-x86_64-android-26.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-26"
     package: "taskcluster/android_cache-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Android cache x86_64 / android-26"
     description: "Setup an Android SDK / emulator cache for Android / x86_64 android-26"
diff --git a/taskcluster/android-cache-x86_64-android-28.yml b/taskcluster/android-cache-x86_64-android-28.yml
index 58fb70c1..4f9b7b8e 100644
--- a/taskcluster/android-cache-x86_64-android-28.yml
+++ b/taskcluster/android-cache-x86_64-android-28.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-28"
     package: "taskcluster/android_cache-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Android cache x86_64 / android-28"
     description: "Setup an Android SDK / emulator cache for Android / x86_64 android-28"
diff --git a/taskcluster/android-cache-x86_64-android-29.yml b/taskcluster/android-cache-x86_64-android-29.yml
index e46f406b..f12c7b81 100644
--- a/taskcluster/android-cache-x86_64-android-29.yml
+++ b/taskcluster/android-cache-x86_64-android-29.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-29"
     package: "taskcluster/android_cache-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Android cache x86_64 / android-29"
     description: "Setup an Android SDK / emulator cache for Android / x86_64 android-29"
diff --git a/taskcluster/android-cache-x86_64-android-30.yml b/taskcluster/android-cache-x86_64-android-30.yml
index 68ab7827..3302f81b 100644
--- a/taskcluster/android-cache-x86_64-android-30.yml
+++ b/taskcluster/android-cache-x86_64-android-30.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-30"
     package: "taskcluster/android_cache-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Android cache x86_64 / android-30"
     description: "Setup an Android SDK / emulator cache for Android / x86_64 android-30"
diff --git a/taskcluster/android-java-opt.yml b/taskcluster/android-java-opt.yml
index c92bfbc5..45086904 100644
--- a/taskcluster/android-java-opt.yml
+++ b/taskcluster/android-java-opt.yml
@@ -25,6 +25,7 @@ build:
     build: "taskcluster/android-apk-build.sh"
     package: "taskcluster/android-apk-package.sh"
   nc_asset_name: "native_client.apk.cpu.android.tar.xz"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "DeepSpeech Android APK (ARM64+ARMv7+x86_64)"
     description: "Building DeepSpeech for Android APK (ARM64+ARMv7+x86_64), optimized version"
diff --git a/taskcluster/android-x86_64-cpu-opt.yml b/taskcluster/android-x86_64-cpu-opt.yml
index 092b7955..e0531df3 100644
--- a/taskcluster/android-x86_64-cpu-opt.yml
+++ b/taskcluster/android-x86_64-cpu-opt.yml
@@ -13,6 +13,7 @@ build:
     build: "taskcluster/android-build.sh x86_64"
     package: "taskcluster/android-package.sh x86_64"
   nc_asset_name: "native_client.x86_64.cpu.android.tar.xz"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "DeepSpeech Android x86_64"
     description: "Building DeepSpeech for Android x86_64, optimized version"
diff --git a/taskcluster/docker-build-base.tyml b/taskcluster/docker-build-base.tyml
index 6d46a4bd..d416bc0b 100644
--- a/taskcluster/docker-build-base.tyml
+++ b/taskcluster/docker-build-base.tyml
@@ -2,7 +2,7 @@ $if: '(event.event != "push") && (event.event != "tag")'
 then:
   taskId: ${taskcluster.taskId}
   provisionerId: ${taskcluster.docker.provisionerId}
-  workerType: ${taskcluster.docker.workerType}
+  workerType: ${build.workerType}
   taskGroupId: ${taskcluster.taskGroupId}
   schedulerId: ${taskcluster.schedulerId}
   created: { $fromNow: '0 sec' }
diff --git a/taskcluster/docker-image-build.yml b/taskcluster/docker-image-build.yml
index 792e14af..bf00ffbd 100644
--- a/taskcluster/docker-image-build.yml
+++ b/taskcluster/docker-image-build.yml
@@ -1,6 +1,7 @@
 build:
   template_file: docker-build-base.tyml
   dockerfile: "Dockerfile.build"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "DeepSpeech Docker build"
     description: "Testing |docker build| of DeepSpeech build image"
diff --git a/taskcluster/docker-image-train.yml b/taskcluster/docker-image-train.yml
index 03f9abea..407ab646 100644
--- a/taskcluster/docker-image-train.yml
+++ b/taskcluster/docker-image-train.yml
@@ -1,6 +1,7 @@
 build:
   template_file: docker-build-base.tyml
   dockerfile: "Dockerfile.train"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "DeepSpeech Docker train"
     description: "Testing |docker build| of DeepSpeech train image"
diff --git a/taskcluster/docs.tyml b/taskcluster/docs.tyml
index f015c396..9768de9d 100644
--- a/taskcluster/docs.tyml
+++ b/taskcluster/docs.tyml
@@ -2,7 +2,7 @@ $if: 'event.event in build.allowed'
 then:
   taskId: ${taskcluster.taskId}
   provisionerId: ${taskcluster.docker.provisionerId}
-  workerType: ${taskcluster.docker.workerType}
+  workerType: ${build.workerType}
   taskGroupId: ${taskcluster.taskGroupId}
   schedulerId: ${taskcluster.schedulerId}
   dependencies:
diff --git a/taskcluster/docs.yml b/taskcluster/docs.yml
index 18e71998..6a860dda 100644
--- a/taskcluster/docs.yml
+++ b/taskcluster/docs.yml
@@ -11,6 +11,7 @@ build:
   scripts:
     build: "taskcluster/docs-build.sh"
     package: "taskcluster/docs-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "DeepSpeech API Documentation"
     description: "Building DeepSpeech API Documentation"
diff --git a/taskcluster/examples-base.tyml b/taskcluster/examples-base.tyml
index 42fa54c9..82f3760d 100644
--- a/taskcluster/examples-base.tyml
+++ b/taskcluster/examples-base.tyml
@@ -2,7 +2,7 @@ $if: '(event.event != "push") && (event.event != "tag")'
 then:
   taskId: ${taskcluster.taskId}
   provisionerId: ${taskcluster.docker.provisionerId}
-  workerType: ${taskcluster.docker.workerType}
+  workerType: ${build.workerType}
   taskGroupId: ${taskcluster.taskGroupId}
   schedulerId: ${taskcluster.schedulerId}
   dependencies:
diff --git a/taskcluster/examples-ffmpeg_vad_streaming-node10.yml b/taskcluster/examples-ffmpeg_vad_streaming-node10.yml
index 8a25d347..6b00c1d5 100644
--- a/taskcluster/examples-ffmpeg_vad_streaming-node10.yml
+++ b/taskcluster/examples-ffmpeg_vad_streaming-node10.yml
@@ -8,6 +8,7 @@ build:
       apt-get -qq -y install ffmpeg
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/examples/ffmpeg_vad_streaming/test.sh"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech examples: ffmpeg VAD Streaming NodeJS v10.x"
     description: "DeepSpeech examples: ffmpeg VAD Streaming NodeJS v10.x"
diff --git a/taskcluster/examples-ffmpeg_vad_streaming-node12.yml b/taskcluster/examples-ffmpeg_vad_streaming-node12.yml
index 4d7cab43..24e81f34 100644
--- a/taskcluster/examples-ffmpeg_vad_streaming-node12.yml
+++ b/taskcluster/examples-ffmpeg_vad_streaming-node12.yml
@@ -8,6 +8,7 @@ build:
       apt-get -qq -y install ffmpeg
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/examples/ffmpeg_vad_streaming/test.sh"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech examples: ffmpeg VAD Streaming NodeJS v12.x"
     description: "DeepSpeech examples: ffmpeg VAD Streaming NodeJS v12.x"
diff --git a/taskcluster/examples-mic_vad_streaming-py36.yml b/taskcluster/examples-mic_vad_streaming-py36.yml
index f4546a34..98e825a9 100644
--- a/taskcluster/examples-mic_vad_streaming-py36.yml
+++ b/taskcluster/examples-mic_vad_streaming-py36.yml
@@ -8,6 +8,7 @@ build:
       apt-get -qq -y install portaudio19-dev pulseaudio
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/examples/mic_vad_streaming/test.sh 3.6.0:m"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech examples: mic VAD streaming Py3.6"
     description: "DeepSpeech examples: mic VAD streaming Python 3.6"
diff --git a/taskcluster/examples-mic_vad_streaming-py37.yml b/taskcluster/examples-mic_vad_streaming-py37.yml
index 9c3c42a8..59773509 100644
--- a/taskcluster/examples-mic_vad_streaming-py37.yml
+++ b/taskcluster/examples-mic_vad_streaming-py37.yml
@@ -8,6 +8,7 @@ build:
       apt-get -qq -y install portaudio19-dev pulseaudio
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/examples/mic_vad_streaming/test.sh 3.7.0:m"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech examples: mic VAD streaming Py3.7"
     description: "DeepSpeech examples: mic VAD streaming Python 3.7"
diff --git a/taskcluster/examples-nodejs_wav-node10.yml b/taskcluster/examples-nodejs_wav-node10.yml
index 9785dad9..36c8a3cc 100644
--- a/taskcluster/examples-nodejs_wav-node10.yml
+++ b/taskcluster/examples-nodejs_wav-node10.yml
@@ -5,6 +5,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/examples/nodejs_wav/test.sh"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech examples: NodeJS WAV NodeJS v10.x"
     description: "DeepSpeech examples: NodeJS WAV NodeJS v10.x"
diff --git a/taskcluster/examples-nodejs_wav-node12.yml b/taskcluster/examples-nodejs_wav-node12.yml
index f0b49c42..2ec849f0 100644
--- a/taskcluster/examples-nodejs_wav-node12.yml
+++ b/taskcluster/examples-nodejs_wav-node12.yml
@@ -5,6 +5,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/examples/nodejs_wav/test.sh"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech examples: NodeJS WAV NodeJS v12.x"
     description: "DeepSpeech examples: NodeJS WAV NodeJS v12.x"
diff --git a/taskcluster/examples-vad_transcriber-py35.yml b/taskcluster/examples-vad_transcriber-py35.yml
index 612f098b..ebf891af 100644
--- a/taskcluster/examples-vad_transcriber-py35.yml
+++ b/taskcluster/examples-vad_transcriber-py35.yml
@@ -5,6 +5,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/examples/vad_transcriber/test.sh 3.5.0:m"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech examples: VAD transcriber Py3.5"
     description: "DeepSpeech examples: VAD transcriberaming Python 3.5"
diff --git a/taskcluster/examples-vad_transcriber-py36.yml b/taskcluster/examples-vad_transcriber-py36.yml
index 234a44ef..a7cdfd48 100644
--- a/taskcluster/examples-vad_transcriber-py36.yml
+++ b/taskcluster/examples-vad_transcriber-py36.yml
@@ -5,6 +5,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/examples/vad_transcriber/test.sh 3.6.0:m"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech examples: VAD transcriber Py3.6"
     description: "DeepSpeech examples: VAD transcriberaming Python 3.6"
diff --git a/taskcluster/examples-vad_transcriber-py37.yml b/taskcluster/examples-vad_transcriber-py37.yml
index 2a17c126..c5c4eeca 100644
--- a/taskcluster/examples-vad_transcriber-py37.yml
+++ b/taskcluster/examples-vad_transcriber-py37.yml
@@ -5,6 +5,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/examples/vad_transcriber/test.sh 3.7.0:m"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech examples: VAD transcriber Py3.7"
     description: "DeepSpeech examples: VAD transcriberaming Python 3.7"
diff --git a/taskcluster/examples-vad_transcriber-py38.yml b/taskcluster/examples-vad_transcriber-py38.yml
index bcf2035d..5542ef43 100644
--- a/taskcluster/examples-vad_transcriber-py38.yml
+++ b/taskcluster/examples-vad_transcriber-py38.yml
@@ -5,6 +5,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/examples/vad_transcriber/test.sh 3.8.0:"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech examples: VAD transcriber Py3.8"
     description: "DeepSpeech examples: VAD transcriberaming Python 3.8"
diff --git a/taskcluster/generic_tc_caching-linux-opt-base.tyml b/taskcluster/generic_tc_caching-linux-opt-base.tyml
index 7de29ada..3e9cbded 100644
--- a/taskcluster/generic_tc_caching-linux-opt-base.tyml
+++ b/taskcluster/generic_tc_caching-linux-opt-base.tyml
@@ -1,6 +1,6 @@
 taskId: ${taskcluster.taskId}
 provisionerId: ${taskcluster.docker.provisionerId}
-workerType: ${taskcluster.docker.workerType}
+workerType: ${build.workerType}
 taskGroupId: ${taskcluster.taskGroupId}
 schedulerId: ${taskcluster.schedulerId}
 created: { $fromNow: '0 sec' }
diff --git a/taskcluster/gradle-cache.yml b/taskcluster/gradle-cache.yml
index fab5b101..a862fa90 100644
--- a/taskcluster/gradle-cache.yml
+++ b/taskcluster/gradle-cache.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/gradle-build.sh"
     package: "taskcluster/gradle-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Builds Gradle cache"
     description: "Setup a Gradle cache for Android"
diff --git a/taskcluster/linux-amd64-cpu-opt.yml b/taskcluster/linux-amd64-cpu-opt.yml
index 380242a1..cf82289c 100644
--- a/taskcluster/linux-amd64-cpu-opt.yml
+++ b/taskcluster/linux-amd64-cpu-opt.yml
@@ -19,6 +19,7 @@ build:
     build: "taskcluster/host-build.sh"
     package: "taskcluster/package.sh"
   nc_asset_name: "native_client.amd64.cpu.linux.tar.xz"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU"
     description: "Building DeepSpeech for Linux/AMD64, CPU only, optimized version"
diff --git a/taskcluster/linux-amd64-ctc-opt.yml b/taskcluster/linux-amd64-ctc-opt.yml
index 1a3cb9b6..7edef380 100644
--- a/taskcluster/linux-amd64-ctc-opt.yml
+++ b/taskcluster/linux-amd64-ctc-opt.yml
@@ -18,6 +18,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: 'taskcluster/decoder-build.sh'
     package: 'taskcluster/decoder-package.sh'
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "DeepSpeech CTC Decoder Linux AMD64 CPU"
     description: "Building DeepSpeech CTC Decoder for Linux/AMD64, CPU only, optimized version"
diff --git a/taskcluster/linux-amd64-gpu-opt.yml b/taskcluster/linux-amd64-gpu-opt.yml
index df7d49ac..486c7bc6 100644
--- a/taskcluster/linux-amd64-gpu-opt.yml
+++ b/taskcluster/linux-amd64-gpu-opt.yml
@@ -20,6 +20,7 @@ build:
     build: "taskcluster/cuda-build.sh"
     package: "taskcluster/package.sh"
   nc_asset_name: "native_client.amd64.cuda.linux.tar.xz"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "DeepSpeech Linux AMD64 CUDA"
     description: "Building DeepSpeech for Linux/AMD64, CUDA-enabled, optimized version"
diff --git a/taskcluster/linux-amd64-tflite-opt.yml b/taskcluster/linux-amd64-tflite-opt.yml
index a6b8e547..117162ee 100644
--- a/taskcluster/linux-amd64-tflite-opt.yml
+++ b/taskcluster/linux-amd64-tflite-opt.yml
@@ -19,6 +19,7 @@ build:
     build: "taskcluster/host-build.sh tflite"
     package: "taskcluster/package.sh"
   nc_asset_name: "native_client.amd64.tflite.linux.tar.xz"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite"
     description: "Building DeepSpeech for Linux/AMD64, TFLite, optimized version"
diff --git a/taskcluster/linux-arm64-cpu-opt.yml b/taskcluster/linux-arm64-cpu-opt.yml
index 0d42b573..cf0a72a1 100644
--- a/taskcluster/linux-arm64-cpu-opt.yml
+++ b/taskcluster/linux-arm64-cpu-opt.yml
@@ -26,6 +26,7 @@ build:
     build: "taskcluster/arm64-build.sh"
     package: "taskcluster/package.sh"
   nc_asset_name: "native_client.arm64.cpu.linux.tar.xz"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "DeepSpeech Linux ARM64 Cortex-A53 CPU"
     description: "Building DeepSpeech for Linux ARM64 Cortex-A53, CPU only, optimized version"
diff --git a/taskcluster/linux-opt-base.tyml b/taskcluster/linux-opt-base.tyml
index 188c04bf..e84d738e 100644
--- a/taskcluster/linux-opt-base.tyml
+++ b/taskcluster/linux-opt-base.tyml
@@ -2,7 +2,7 @@ $if: 'event.event in build.allowed'
 then:
   taskId: ${taskcluster.taskId}
   provisionerId: ${taskcluster.docker.provisionerId}
-  workerType: ${taskcluster.docker.workerType}
+  workerType: ${build.workerType}
   taskGroupId: ${taskcluster.taskGroupId}
   schedulerId: ${taskcluster.schedulerId}
   dependencies:
diff --git a/taskcluster/linux-rpi3-cpu-opt.yml b/taskcluster/linux-rpi3-cpu-opt.yml
index b919c04e..018060ef 100644
--- a/taskcluster/linux-rpi3-cpu-opt.yml
+++ b/taskcluster/linux-rpi3-cpu-opt.yml
@@ -25,6 +25,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/rpi3-build.sh"
     package: "taskcluster/package.sh"
+  workerType: "${docker.dsBuild}"
   nc_asset_name: "native_client.rpi3.cpu.linux.tar.xz"
   metadata:
     name: "DeepSpeech Linux RPi3/ARMv7 CPU"
diff --git a/taskcluster/node-gyp-cache.yml b/taskcluster/node-gyp-cache.yml
index 219dd935..1961d440 100644
--- a/taskcluster/node-gyp-cache.yml
+++ b/taskcluster/node-gyp-cache.yml
@@ -11,6 +11,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/node-gyp-populate.sh"
     package: "taskcluster/node-gyp-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "Cache for node-gyp headers"
     description: "Building cache for node-gyp headers"
diff --git a/taskcluster/node-package-cpu.yml b/taskcluster/node-package-cpu.yml
index 6769543b..bcb838c4 100644
--- a/taskcluster/node-package-cpu.yml
+++ b/taskcluster/node-package-cpu.yml
@@ -13,6 +13,7 @@ build:
   scripts:
     build: "taskcluster/node-build.sh"
     package: "taskcluster/node-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "DeepSpeech NodeJS CPU package"
     description: "Packaging DeepSpeech CPU for registry"
diff --git a/taskcluster/node-package-gpu.yml b/taskcluster/node-package-gpu.yml
index a430b4b1..26c65b5e 100644
--- a/taskcluster/node-package-gpu.yml
+++ b/taskcluster/node-package-gpu.yml
@@ -10,6 +10,7 @@ build:
   scripts:
     build: "taskcluster/node-build.sh --cuda"
     package: "taskcluster/node-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "DeepSpeech NodeJS GPU package"
     description: "Packaging DeepSpeech GPU for registry"
diff --git a/taskcluster/node-package-opt-base.tyml b/taskcluster/node-package-opt-base.tyml
index a9989ca1..d2682a28 100644
--- a/taskcluster/node-package-opt-base.tyml
+++ b/taskcluster/node-package-opt-base.tyml
@@ -2,7 +2,7 @@ $if: 'event.event in build.allowed'
 then:
   taskId: ${taskcluster.taskId}
   provisionerId: ${taskcluster.docker.provisionerId}
-  workerType: ${taskcluster.docker.workerType}
+  workerType: ${build.workerType}
   taskGroupId: ${taskcluster.taskGroupId}
   schedulerId: ${taskcluster.schedulerId}
   dependencies:
diff --git a/taskcluster/node-package-tflite.yml b/taskcluster/node-package-tflite.yml
index 00338446..4cad0f88 100644
--- a/taskcluster/node-package-tflite.yml
+++ b/taskcluster/node-package-tflite.yml
@@ -11,6 +11,7 @@ build:
   scripts:
     build: "taskcluster/node-build.sh --tflite"
     package: "taskcluster/node-package.sh"
+  workerType: "${docker.smallTask}"
   metadata:
     name: "DeepSpeech NodeJS TFLite package"
     description: "Packaging DeepSpeech TFLite for registry"
diff --git a/taskcluster/pyenv-linux-amd64.yml b/taskcluster/pyenv-linux-amd64.yml
index ddf81ef8..07cd1eff 100644
--- a/taskcluster/pyenv-linux-amd64.yml
+++ b/taskcluster/pyenv-linux-amd64.yml
@@ -10,6 +10,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/pyenv-build.sh"
     package: "taskcluster/pyenv-package.sh"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "Builds Pyenv Linux AMD64"
     description: "Setup a builds Pyenv for Linux/AMD64"
diff --git a/taskcluster/swig-linux-amd64.yml b/taskcluster/swig-linux-amd64.yml
index c3abe79a..e4d2ac02 100644
--- a/taskcluster/swig-linux-amd64.yml
+++ b/taskcluster/swig-linux-amd64.yml
@@ -15,6 +15,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/build.sh"
     package: "taskcluster/package.sh"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "SWIG Linux AMD64"
     description: "Building SWIG for Linux/AMD64"
diff --git a/taskcluster/swig-win-amd64.yml b/taskcluster/swig-win-amd64.yml
index e77a2971..31445730 100644
--- a/taskcluster/swig-win-amd64.yml
+++ b/taskcluster/swig-win-amd64.yml
@@ -16,6 +16,7 @@ build:
     setup: "taskcluster/tc-true.sh"
     build: "taskcluster/build.sh x86_64-w64-mingw32"
     package: "taskcluster/package.sh"
+  workerType: "${docker.dsBuild}"
   metadata:
     name: "SWIG Windows AMD64"
     description: "Building SWIG for Windows/AMD64"
diff --git a/taskcluster/test-android-opt-base.tyml b/taskcluster/test-android-opt-base.tyml
index c2911d77..f1cdba74 100644
--- a/taskcluster/test-android-opt-base.tyml
+++ b/taskcluster/test-android-opt-base.tyml
@@ -2,7 +2,7 @@ $if: '(event.event != "push") && (event.event != "tag")'
 then:
   taskId: ${taskcluster.taskId}
   provisionerId: ${taskcluster.docker.provisionerId}
-  workerType: ${taskcluster.docker.workerType}
+  workerType: ${build.workerType}
   taskGroupId: ${taskcluster.taskGroupId}
   schedulerId: ${taskcluster.schedulerId}
   dependencies:
diff --git a/taskcluster/test-apk-android-24-x86_64-opt.yml b/taskcluster/test-apk-android-24-x86_64-opt.yml
index ead96e01..a682e960 100644
--- a/taskcluster/test-apk-android-24-x86_64-opt.yml
+++ b/taskcluster/test-apk-android-24-x86_64-opt.yml
@@ -18,6 +18,7 @@ build:
     namespace: ${system.gradle_cache.namespace}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-24 16k"
+  workerType: "${docker.dsHighMemTests}"
   metadata:
     name: "DeepSpeech Android 7.0 x86_64 Google Pixel APK/Java tests"
     description: "Testing DeepSpeech APK/Java for Android 7.0 x86_64 Google Pixel, optimized version"
diff --git a/taskcluster/test-apk-android-25-x86_64-opt.yml b/taskcluster/test-apk-android-25-x86_64-opt.yml
index fbf2c655..56132961 100644
--- a/taskcluster/test-apk-android-25-x86_64-opt.yml
+++ b/taskcluster/test-apk-android-25-x86_64-opt.yml
@@ -18,6 +18,7 @@ build:
     namespace: ${system.gradle_cache.namespace}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-25 16k"
+  workerType: "${docker.dsHighMemTests}"
   metadata:
     name: "DeepSpeech Android 7.1 x86_64 Google Pixel APK/Java tests"
     description: "Testing DeepSpeech APK/Java for Android 7.1 x86_64 Google Pixel, optimized version"
diff --git a/taskcluster/test-apk-android-26-x86_64-opt.yml b/taskcluster/test-apk-android-26-x86_64-opt.yml
index 4fbc90e4..62f33cf8 100644
--- a/taskcluster/test-apk-android-26-x86_64-opt.yml
+++ b/taskcluster/test-apk-android-26-x86_64-opt.yml
@@ -18,6 +18,7 @@ build:
     namespace: ${system.gradle_cache.namespace}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-26"
+  workerType: "${docker.dsHighMemTests}"
   metadata:
     name: "DeepSpeech Android 8.0 x86_64 Google Pixel APK/Java tests"
     description: "Testing DeepSpeech APK/Java for Android 8.0 x86_64 Google Pixel, optimized version"
diff --git a/taskcluster/test-apk-android-28-x86_64-opt.yml b/taskcluster/test-apk-android-28-x86_64-opt.yml
index 793b5472..e1d790f7 100644
--- a/taskcluster/test-apk-android-28-x86_64-opt.yml
+++ b/taskcluster/test-apk-android-28-x86_64-opt.yml
@@ -18,6 +18,7 @@ build:
     namespace: ${system.gradle_cache.namespace}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-28"
+  workerType: "${docker.dsHighMemTests}"
   metadata:
     name: "DeepSpeech Android 9.0 x86_64 Google Pixel APK/Java tests"
     description: "Testing DeepSpeech APK/Java for Android 9.0 x86_64 Google Pixel, optimized version"
diff --git a/taskcluster/test-apk-android-29-x86_64-opt.yml b/taskcluster/test-apk-android-29-x86_64-opt.yml
index 00aa6ef8..efabecec 100644
--- a/taskcluster/test-apk-android-29-x86_64-opt.yml
+++ b/taskcluster/test-apk-android-29-x86_64-opt.yml
@@ -18,6 +18,7 @@ build:
     namespace: ${system.gradle_cache.namespace}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-29"
+  workerType: "${docker.dsHighMemTests}"
   metadata:
     name: "DeepSpeech Android 10.0 x86_64 Google Pixel APK/Java tests"
     description: "Testing DeepSpeech APK/Java for Android 10.0 x86_64 Google Pixel, optimized version"
diff --git a/taskcluster/test-apk-android-30-x86_64-opt.yml b/taskcluster/test-apk-android-30-x86_64-opt.yml
index c3ee8265..12fed734 100644
--- a/taskcluster/test-apk-android-30-x86_64-opt.yml
+++ b/taskcluster/test-apk-android-30-x86_64-opt.yml
@@ -18,6 +18,7 @@ build:
     namespace: ${system.gradle_cache.namespace}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-30"
+  workerType: "${docker.dsHighMemTests}"
   metadata:
     name: "DeepSpeech Android 11.0 x86_64 Google Pixel APK/Java tests"
     description: "Testing DeepSpeech APK/Java for Android 11.0 x86_64 Google Pixel, optimized version"
diff --git a/taskcluster/test-augmentations-linux-amd64-py36m-opt.yml b/taskcluster/test-augmentations-linux-amd64-py36m-opt.yml
index 8007cd6c..e05640d1 100644
--- a/taskcluster/test-augmentations-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-augmentations-linux-amd64-py36m-opt.yml
@@ -7,6 +7,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-augmentation-tests.sh 3.6.10:m"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU signal augmentations Py3.6"
     description: "Augmenting LDC93S1 sample in different ways for Linux/AMD64 16kHz Python 3.6, CPU only, optimized version"
diff --git a/taskcluster/test-cpp-android-24-arm64-opt.yml b/taskcluster/test-cpp-android-24-arm64-opt.yml
index 5125244f..f8634afd 100644
--- a/taskcluster/test-cpp-android-24-arm64-opt.yml
+++ b/taskcluster/test-cpp-android-24-arm64-opt.yml
@@ -10,6 +10,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-24 16k"
+  workerType: "${docker.dsHighMemTests}"
   metadata:
     name: "DeepSpeech Android 7.0 ARM64 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.0 ARM64 Google Pixel, optimized version"
diff --git a/taskcluster/test-cpp-android-24-armv7-opt.yml b/taskcluster/test-cpp-android-24-armv7-opt.yml
index 37a45300..c81bba47 100644
--- a/taskcluster/test-cpp-android-24-armv7-opt.yml
+++ b/taskcluster/test-cpp-android-24-armv7-opt.yml
@@ -10,6 +10,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-24 16k"
+  workerType: "${docker.dsHighMemTests}"
   metadata:
     name: "DeepSpeech Android 7.0 ARMv7 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.0 ARMv7 Google Pixel, optimized version"
diff --git a/taskcluster/test-cpp-android-25-arm64-opt.yml b/taskcluster/test-cpp-android-25-arm64-opt.yml
index bc450863..ae002cef 100644
--- a/taskcluster/test-cpp-android-25-arm64-opt.yml
+++ b/taskcluster/test-cpp-android-25-arm64-opt.yml
@@ -10,6 +10,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-25 16k"
+  workerType: "${docker.dsHighMemTests}"
   metadata:
     name: "DeepSpeech Android 7.1 ARM64 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.1 ARM64 Google Pixel, optimized version"
diff --git a/taskcluster/test-cpp-android-25-armv7-opt.yml b/taskcluster/test-cpp-android-25-armv7-opt.yml
index 85818edf..fa8c5f8d 100644
--- a/taskcluster/test-cpp-android-25-armv7-opt.yml
+++ b/taskcluster/test-cpp-android-25-armv7-opt.yml
@@ -10,6 +10,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-25 16k"
+  workerType: "${docker.dsHighMemTests}"
   metadata:
     name: "DeepSpeech Android 7.1 ARMv7 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.1 ARMv7 Google Pixel, optimized version"
diff --git a/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
index 13a95924..c5019231 100644
--- a/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests-prod.sh 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU C++ prod tests"
     description: "Testing DeepSpeech C++ for Linux/AMD64 on prod model, CPU only, optimized version"
diff --git a/taskcluster/test-cpp_16k-linux-amd64-opt.yml b/taskcluster/test-cpp_16k-linux-amd64-opt.yml
index 3d9f9810..35d95838 100644
--- a/taskcluster/test-cpp_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-cpp_16k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU C++ tests (16kHz)"
     description: "Testing DeepSpeech C++ for Linux/AMD64, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml b/taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml
index 0faa46d4..bead6046 100755
--- a/taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml
+++ b/taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite C++ tests (16kHz)"
     description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp_8k-linux-amd64-opt.yml b/taskcluster/test-cpp_8k-linux-amd64-opt.yml
index 29e52fbc..e0c73476 100644
--- a/taskcluster/test-cpp_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-cpp_8k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU C++ tests (8kHz)"
     description: "Testing DeepSpeech C++ for Linux/AMD64, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-cpp_8k_tflite-linux-amd64-opt.yml b/taskcluster/test-cpp_8k_tflite-linux-amd64-opt.yml
index 9a1acce8..fc7bb2a2 100755
--- a/taskcluster/test-cpp_8k_tflite-linux-amd64-opt.yml
+++ b/taskcluster/test-cpp_8k_tflite-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite C++ tests (16kHz)"
     description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml
index 5ff4a6c6..91cf9fc2 100755
--- a/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-tflite-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-tests-prod.sh 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite C++ prod tests"
     description: "Testing DeepSpeech C++ for Linux/AMD64 on prod model, TFLite, optimized version"
diff --git a/taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml
index eeee2228..8b362864 100644
--- a/taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v5.0 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v5.0, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v5.0_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v5.0_8k-linux-amd64-opt.yml
index f730719f..5ecd4ed4 100644
--- a/taskcluster/test-electronjs_v5.0_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v5.0_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v5.0 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v5.0, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml
index a187f6c7..d8a9d7ef 100644
--- a/taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.12 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.0 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.0, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v6.0_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v6.0_8k-linux-amd64-opt.yml
index 97286fb5..b7f5ca3f 100644
--- a/taskcluster/test-electronjs_v6.0_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v6.0_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.12 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.0 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.0, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v6.1_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v6.1_16k-linux-amd64-opt.yml
index 80a7cdd5..dcbd5799 100644
--- a/taskcluster/test-electronjs_v6.1_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v6.1_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.1.7 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.1 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.1, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v6.1_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v6.1_8k-linux-amd64-opt.yml
index 8a0d782e..45c965ab 100644
--- a/taskcluster/test-electronjs_v6.1_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v6.1_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.1.7 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.1 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.1, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml
index c058ef71..fb793d8d 100644
--- a/taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.0 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.0, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v7.0_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.0_8k-linux-amd64-opt.yml
index b20971c2..5562c0a9 100644
--- a/taskcluster/test-electronjs_v7.0_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.0_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.0 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.0, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v7.1_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.1_16k-linux-amd64-opt.yml
index 4bd254df..ffcc3000 100644
--- a/taskcluster/test-electronjs_v7.1_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.1_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v7.1_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.1_8k-linux-amd64-opt.yml
index da038090..4e5976aa 100644
--- a/taskcluster/test-electronjs_v7.1_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.1_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v8.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v8.0_16k-linux-amd64-opt.yml
index fa2387c7..579fce59 100644
--- a/taskcluster/test-electronjs_v8.0_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v8.0_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 8.0.1 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v8.0 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v8.0, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v8.0_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v8.0_8k-linux-amd64-opt.yml
index f971042a..e8ff0815 100644
--- a/taskcluster/test-electronjs_v8.0_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v8.0_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 8.0.1 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v8.0 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v8.0, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v9.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v9.0_16k-linux-amd64-opt.yml
index 15f53576..fe676063 100644
--- a/taskcluster/test-electronjs_v9.0_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v9.0_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v9.0 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v9.0, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v9.0_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v9.0_8k-linux-amd64-opt.yml
index 4704d64d..90595402 100644
--- a/taskcluster/test-electronjs_v9.0_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v9.0_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v9.0 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v9.0, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v9.1_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v9.1_16k-linux-amd64-opt.yml
index fdc01dc6..beb9cefa 100644
--- a/taskcluster/test-electronjs_v9.1_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v9.1_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v9.1 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v9.1, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v9.1_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v9.1_8k-linux-amd64-opt.yml
index c8684c3a..3b16ef0e 100644
--- a/taskcluster/test-electronjs_v9.1_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v9.1_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v9.1 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v9.1, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-evaluate_tflite-linux-amd64-py36m-opt.yml b/taskcluster/test-evaluate_tflite-linux-amd64-py36m-opt.yml
index 3356866e..dfa3023f 100644
--- a/taskcluster/test-evaluate_tflite-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-evaluate_tflite-linux-amd64-py36m-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-evaluate_tflite.sh 3.6.10:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU evaluate_tflite.py Py3.6 (16kHz)"
     description: "Test evaluate_tflite.py on Linux/AMD64 using upstream TensorFlow Python 3.6, CPU only, optimized version"
diff --git a/taskcluster/test-linux-opt-base.tyml b/taskcluster/test-linux-opt-base.tyml
index 67f8220b..054f1a52 100644
--- a/taskcluster/test-linux-opt-base.tyml
+++ b/taskcluster/test-linux-opt-base.tyml
@@ -2,7 +2,7 @@ $if: '(event.event != "push") && (event.event != "tag")'
 then:
   taskId: ${taskcluster.taskId}
   provisionerId: ${taskcluster.docker.provisionerId}
-  workerType: ${taskcluster.docker.workerType}
+  workerType: ${build.workerType}
   taskGroupId: ${taskcluster.taskGroupId}
   schedulerId: ${taskcluster.schedulerId}
   dependencies:
diff --git a/taskcluster/test-linux-opt-tag-base.tyml b/taskcluster/test-linux-opt-tag-base.tyml
index 78c87625..631b97c3 100644
--- a/taskcluster/test-linux-opt-tag-base.tyml
+++ b/taskcluster/test-linux-opt-tag-base.tyml
@@ -2,7 +2,7 @@ $if: '(event.event in build.allowed) && ((event.event != "tag") || (build.ref_ma
 then:
   taskId: ${taskcluster.taskId}
   provisionerId: ${taskcluster.docker.provisionerId}
-  workerType: ${taskcluster.docker.workerType}
+  workerType: ${build.workerType}
   taskGroupId: ${taskcluster.taskGroupId}
   schedulerId: ${taskcluster.schedulerId}
   dependencies:
diff --git a/taskcluster/test-nodejs_10x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_10x_16k-linux-amd64-opt.yml
index f5a6bba6..7f6d104c 100644
--- a/taskcluster/test-nodejs_10x_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_10x_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml
index b0ba032e..6e09e3c2 100644
--- a/taskcluster/test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 10.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml
index 084d1a4e..1f8513f5 100644
--- a/taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 10.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS 10.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_10x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_10x_8k-linux-amd64-opt.yml
index d8e572a8..66736a74 100644
--- a/taskcluster/test-nodejs_10x_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_10x_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml
index d243a8bf..002ad53e 100644
--- a/taskcluster/test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 10.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml
index caf92571..c9cf0178 100644
--- a/taskcluster/test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 10.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS 10.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_11x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_11x_16k-linux-amd64-opt.yml
index c737f973..cb27d005 100644
--- a/taskcluster/test-nodejs_11x_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_11x_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_11x_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_11x_16k-linux-amd64-prod_pbmodel-opt.yml
index e4aa5133..9f4cd2b0 100644
--- a/taskcluster/test-nodejs_11x_16k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_11x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 11.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_11x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_11x_16k_tflite-linux-amd64-prod-opt.yml
index d3828c29..554b0930 100644
--- a/taskcluster/test-nodejs_11x_16k_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_11x_16k_tflite-linux-amd64-prod-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 11.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS 11.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_11x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_11x_8k-linux-amd64-opt.yml
index caf87066..7a69bfb8 100644
--- a/taskcluster/test-nodejs_11x_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_11x_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_11x_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_11x_8k-linux-amd64-prod_pbmodel-opt.yml
index ae9a56e2..d48ac49c 100644
--- a/taskcluster/test-nodejs_11x_8k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_11x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 11.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_11x_8k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_11x_8k_tflite-linux-amd64-prod-opt.yml
index 30400533..c459fbd0 100644
--- a/taskcluster/test-nodejs_11x_8k_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_11x_8k_tflite-linux-amd64-prod-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 11.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS 11.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_12x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_12x_16k-linux-amd64-opt.yml
index 70dccd10..66968b51 100644
--- a/taskcluster/test-nodejs_12x_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_12x_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_12x_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_12x_16k-linux-amd64-prod_pbmodel-opt.yml
index 2fde9023..26c84115 100644
--- a/taskcluster/test-nodejs_12x_16k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_12x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 12.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_12x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_12x_16k_tflite-linux-amd64-prod-opt.yml
index 7fab7c58..c8cdefeb 100644
--- a/taskcluster/test-nodejs_12x_16k_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_12x_16k_tflite-linux-amd64-prod-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 12.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS 12.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_12x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_12x_8k-linux-amd64-opt.yml
index 02226e4f..d4be2fff 100644
--- a/taskcluster/test-nodejs_12x_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_12x_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_12x_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_12x_8k-linux-amd64-prod_pbmodel-opt.yml
index cee53070..a5a6bd55 100644
--- a/taskcluster/test-nodejs_12x_8k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_12x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 12.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_12x_8k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_12x_8k_tflite-linux-amd64-prod-opt.yml
index 782b189a..3b84e249 100644
--- a/taskcluster/test-nodejs_12x_8k_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_12x_8k_tflite-linux-amd64-prod-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 12.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS 12.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_16k-linux-amd64-opt.yml
index d5247f8d..4e0669a0 100644
--- a/taskcluster/test-nodejs_13x_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_13x_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_13x_16k-linux-amd64-prod_pbmodel-opt.yml
index ceb5ac8e..d400b851 100644
--- a/taskcluster/test-nodejs_13x_16k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_13x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-opt.yml
index d16b502a..75b532ca 100644
--- a/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
index e1829499..f17aab03 100644
--- a/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-tflite-opt.yml b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-tflite-opt.yml
index 370aa323..c9a92652 100644
--- a/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-tflite-opt.yml
+++ b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-tflite-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 13.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS MultiArch Package 13.x tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x, TFLite only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_13x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_13x_16k_tflite-linux-amd64-prod-opt.yml
index 761aad35..ad2df9ba 100644
--- a/taskcluster/test-nodejs_13x_16k_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_13x_16k_tflite-linux-amd64-prod-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 13.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS 13.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_13x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_8k-linux-amd64-opt.yml
index ef2536ac..d95476b7 100644
--- a/taskcluster/test-nodejs_13x_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_13x_8k-linux-amd64-prod_pbmodel-opt.yml
index 73578a55..5fccf9fe 100644
--- a/taskcluster/test-nodejs_13x_8k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_13x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-opt.yml
index a5adcb77..9842e811 100644
--- a/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
index 3f66bdaa..fa6c0b06 100644
--- a/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-tflite-opt.yml b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-tflite-opt.yml
index 0bfb723e..d9b6818a 100644
--- a/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-tflite-opt.yml
+++ b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-tflite-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 13.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS MultiArch Package 13.x tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x, TFLite only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x_8k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_13x_8k_tflite-linux-amd64-prod-opt.yml
index 8689522a..02d0a11e 100644
--- a/taskcluster/test-nodejs_13x_8k_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_13x_8k_tflite-linux-amd64-prod-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 13.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS 13.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_14x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_14x_16k-linux-amd64-opt.yml
index 84b77785..73c4dba3 100644
--- a/taskcluster/test-nodejs_14x_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_14x_16k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 14.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 14.x tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v14.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_14x_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_14x_16k-linux-amd64-prod_pbmodel-opt.yml
index 0d195a45..64e1e7ca 100644
--- a/taskcluster/test-nodejs_14x_16k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_14x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 14.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 14.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v14.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-amd64-opt.yml b/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-amd64-opt.yml
index 4c1c5fa7..4f0699ee 100644
--- a/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 14.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 14.x tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v14.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
index 2f51e579..f1dcf1f6 100644
--- a/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 14.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 14.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v14.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-tflite-opt.yml b/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-tflite-opt.yml
index ef8b1f66..f88a75c6 100644
--- a/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-tflite-opt.yml
+++ b/taskcluster/test-nodejs_14x_16k_multiarchpkg-linux-tflite-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 14.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS MultiArch Package 14.x tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v14.x, TFLite only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_14x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_14x_16k_tflite-linux-amd64-prod-opt.yml
index 57e2d23a..1f2cf18b 100644
--- a/taskcluster/test-nodejs_14x_16k_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_14x_16k_tflite-linux-amd64-prod-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 14.x 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS 14.x prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v14.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_14x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_14x_8k-linux-amd64-opt.yml
index 9f064566..b1c613b3 100644
--- a/taskcluster/test-nodejs_14x_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_14x_8k-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 14.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 14.x tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v14.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_14x_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_14x_8k-linux-amd64-prod_pbmodel-opt.yml
index a90c7dfe..17d86a4e 100644
--- a/taskcluster/test-nodejs_14x_8k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_14x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 14.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS 14.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v14.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-amd64-opt.yml b/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-amd64-opt.yml
index 595bf5dd..f55df623 100644
--- a/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-amd64-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 14.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 14.x tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v14.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
index a66a9345..b3557f66 100644
--- a/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 14.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 14.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v14.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-tflite-opt.yml b/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-tflite-opt.yml
index 3f7db2d5..809e8859 100644
--- a/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-tflite-opt.yml
+++ b/taskcluster/test-nodejs_14x_8k_multiarchpkg-linux-tflite-opt.yml
@@ -10,6 +10,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 14.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS MultiArch Package 14.x tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v14.x, TFLite only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_14x_8k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_14x_8k_tflite-linux-amd64-prod-opt.yml
index 01da67be..511ba1e5 100644
--- a/taskcluster/test-nodejs_14x_8k_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_14x_8k_tflite-linux-amd64-prod-opt.yml
@@ -8,6 +8,7 @@ build:
       ${nodejs.packages_xenial.prep_14} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 14.x 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite NodeJS 14.x prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v14.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-python_35_16k-linux-amd64-opt.yml b/taskcluster/test-python_35_16k-linux-amd64-opt.yml
index c47d90fa..67d5371a 100644
--- a/taskcluster/test-python_35_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_35_16k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.8:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.5 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_35_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_35_16k-linux-amd64-prod_pbmodel-opt.yml
index 808220f4..2e8ec800 100644
--- a/taskcluster/test-python_35_16k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_35_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.5.8:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.5 prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_35_8k-linux-amd64-opt.yml b/taskcluster/test-python_35_8k-linux-amd64-opt.yml
index 5d02920a..c43b9f03 100644
--- a/taskcluster/test-python_35_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_35_8k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.8:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.5 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_35_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_35_8k-linux-amd64-prod_pbmodel-opt.yml
index 0539c5c3..a526b966 100644
--- a/taskcluster/test-python_35_8k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_35_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.5.8:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.5 prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_35_tflite_16k-linux-amd64-opt.yml b/taskcluster/test-python_35_tflite_16k-linux-amd64-opt.yml
index ead4be6b..0dee11b9 100644
--- a/taskcluster/test-python_35_tflite_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_35_tflite_16k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests.sh 3.5.8:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.5 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_35_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_35_tflite_16k-linux-amd64-prod-opt.yml
index 09834d94..a05a6292 100644
--- a/taskcluster/test-python_35_tflite_16k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_35_tflite_16k-linux-amd64-prod-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-tflite-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.5.8:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.5 prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_35_tflite_8k-linux-amd64-prod-opt.yml b/taskcluster/test-python_35_tflite_8k-linux-amd64-prod-opt.yml
index f6040db2..b656b26d 100644
--- a/taskcluster/test-python_35_tflite_8k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_35_tflite_8k-linux-amd64-prod-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-tflite-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.5.8:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.5 prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-python_36_16k-linux-amd64-opt.yml b/taskcluster/test-python_36_16k-linux-amd64-opt.yml
index e2ad438d..d13a0e0c 100644
--- a/taskcluster/test-python_36_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_36_16k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.10:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.6 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_36_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_36_16k-linux-amd64-prod_pbmodel-opt.yml
index ad4b4ab9..14ca3621 100644
--- a/taskcluster/test-python_36_16k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_36_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.6.10:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.6 prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_36_8k-linux-amd64-opt.yml b/taskcluster/test-python_36_8k-linux-amd64-opt.yml
index c0a40f02..176975f9 100644
--- a/taskcluster/test-python_36_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_36_8k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.10:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.6 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_36_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_36_8k-linux-amd64-prod_pbmodel-opt.yml
index a5e2e21a..b1c333e5 100644
--- a/taskcluster/test-python_36_8k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_36_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.6.10:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.6 prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_36_tflite_16k-linux-amd64-opt.yml b/taskcluster/test-python_36_tflite_16k-linux-amd64-opt.yml
index f4b0947c..eddde81b 100644
--- a/taskcluster/test-python_36_tflite_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_36_tflite_16k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests.sh 3.6.10:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.6 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_36_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_36_tflite_16k-linux-amd64-prod-opt.yml
index ea3f1f90..061bcaf9 100644
--- a/taskcluster/test-python_36_tflite_16k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_36_tflite_16k-linux-amd64-prod-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-tflite-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.6.10:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.6 prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_36_tflite_8k-linux-amd64-prod-opt.yml b/taskcluster/test-python_36_tflite_8k-linux-amd64-prod-opt.yml
index 65aa60ea..365e21d2 100644
--- a/taskcluster/test-python_36_tflite_8k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_36_tflite_8k-linux-amd64-prod-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-tflite-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.6.10:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.6 prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-python_37_16k-linux-amd64-opt.yml b/taskcluster/test-python_37_16k-linux-amd64-opt.yml
index 738e5241..a232cbe2 100644
--- a/taskcluster/test-python_37_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_37_16k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.6:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.7 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_37_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_37_16k-linux-amd64-prod_pbmodel-opt.yml
index 4f3df1f3..1ff9a651 100644
--- a/taskcluster/test-python_37_16k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_37_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.7.6:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.7 prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_37_8k-linux-amd64-opt.yml b/taskcluster/test-python_37_8k-linux-amd64-opt.yml
index 3d16b4f3..82609a4f 100644
--- a/taskcluster/test-python_37_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_37_8k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.6:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.7 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_37_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_37_8k-linux-amd64-prod_pbmodel-opt.yml
index b515cfd8..3b74068b 100644
--- a/taskcluster/test-python_37_8k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_37_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.7.6:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.7 prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_37_tflite_16k-linux-amd64-opt.yml b/taskcluster/test-python_37_tflite_16k-linux-amd64-opt.yml
index 12c917cd..38a5b6d5 100644
--- a/taskcluster/test-python_37_tflite_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_37_tflite_16k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests.sh 3.7.6:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.7 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_37_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_37_tflite_16k-linux-amd64-prod-opt.yml
index dec375c7..e5949505 100644
--- a/taskcluster/test-python_37_tflite_16k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_37_tflite_16k-linux-amd64-prod-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-tflite-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.7.6:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.7 prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_37_tflite_8k-linux-amd64-prod-opt.yml b/taskcluster/test-python_37_tflite_8k-linux-amd64-prod-opt.yml
index 2faeb7e3..66134a14 100644
--- a/taskcluster/test-python_37_tflite_8k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_37_tflite_8k-linux-amd64-prod-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-tflite-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.7.6:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.7 prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-python_38_16k-linux-amd64-opt.yml b/taskcluster/test-python_38_16k-linux-amd64-opt.yml
index 0828219f..d58770b9 100644
--- a/taskcluster/test-python_38_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_38_16k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.1: 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.8 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_38_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_38_16k-linux-amd64-prod_pbmodel-opt.yml
index e76f5929..dd3c8475 100644
--- a/taskcluster/test-python_38_16k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_38_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.8.1: 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.8 prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_38_8k-linux-amd64-opt.yml b/taskcluster/test-python_38_8k-linux-amd64-opt.yml
index 402fcc78..54804a9a 100644
--- a/taskcluster/test-python_38_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_38_8k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.1: 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.8 tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_38_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_38_8k-linux-amd64-prod_pbmodel-opt.yml
index 72d0ff47..2c26505c 100644
--- a/taskcluster/test-python_38_8k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_38_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.8.1: 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.8 prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_38_tflite_16k-linux-amd64-opt.yml b/taskcluster/test-python_38_tflite_16k-linux-amd64-opt.yml
index 977518e2..0700f222 100644
--- a/taskcluster/test-python_38_tflite_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_38_tflite_16k-linux-amd64-opt.yml
@@ -6,6 +6,7 @@ build:
   test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests.sh 3.8.1: 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.8 tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_38_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_38_tflite_16k-linux-amd64-prod-opt.yml
index a595680d..c2b666b2 100644
--- a/taskcluster/test-python_38_tflite_16k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_38_tflite_16k-linux-amd64-prod-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-tflite-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.8.1: 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.8 prod tests (16kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_38_tflite_8k-linux-amd64-prod-opt.yml b/taskcluster/test-python_38_tflite_8k-linux-amd64-prod-opt.yml
index bf06a75a..44d281df 100644
--- a/taskcluster/test-python_38_tflite_8k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_38_tflite_8k-linux-amd64-prod-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-tflite-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.8.1: 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite Python v3.8 prod tests (8kHz)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-singleshotinference-linux-amd64-py36m-opt.yml b/taskcluster/test-singleshotinference-linux-amd64-py36m-opt.yml
index 610e0c8f..c84c5c4b 100644
--- a/taskcluster/test-singleshotinference-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-singleshotinference-linux-amd64-py36m-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-ctc-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-single-shot-inference.sh 3.6.10:m"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU single-shot inference Py3.6"
     description: "Single-shot inference a DeepSpeech LDC93S1 checkpoint for Linux/AMD64 using upstream TensorFlow Python 3.6, CPU only, optimized version"
diff --git a/taskcluster/test-training-extra_16k-linux-amd64-py35m-opt.yml b/taskcluster/test-training-extra_16k-linux-amd64-py35m-opt.yml
index 3b1e1378..65273efc 100644
--- a/taskcluster/test-training-extra_16k-linux-amd64-py35m-opt.yml
+++ b/taskcluster/test-training-extra_16k-linux-amd64-py35m-opt.yml
@@ -7,6 +7,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-extra-tests.sh 3.5.8:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 8kHz all training features Py3.7"
     description: "Training (all features) a DeepSpeech LDC93S1 model for Linux/AMD64 8kHz Python 3.7, CPU only, optimized version"
diff --git a/taskcluster/test-training-extra_16k-linux-amd64-py36m-opt.yml b/taskcluster/test-training-extra_16k-linux-amd64-py36m-opt.yml
index c75bc7a2..95605532 100644
--- a/taskcluster/test-training-extra_16k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training-extra_16k-linux-amd64-py36m-opt.yml
@@ -7,6 +7,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-extra-tests.sh 3.6.10:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 8kHz all training features Py3.7"
     description: "Training (all features) a DeepSpeech LDC93S1 model for Linux/AMD64 8kHz Python 3.7, CPU only, optimized version"
diff --git a/taskcluster/test-training-extra_16k-linux-amd64-py37m-opt.yml b/taskcluster/test-training-extra_16k-linux-amd64-py37m-opt.yml
index 79f9419d..f6d13ebb 100644
--- a/taskcluster/test-training-extra_16k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training-extra_16k-linux-amd64-py37m-opt.yml
@@ -7,6 +7,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-extra-tests.sh 3.7.6:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 8kHz all training features Py3.7"
     description: "Training (all features) a DeepSpeech LDC93S1 model for Linux/AMD64 8kHz Python 3.7, CPU only, optimized version"
diff --git a/taskcluster/test-training-extra_8k-linux-amd64-py36m-opt.yml b/taskcluster/test-training-extra_8k-linux-amd64-py36m-opt.yml
index a5335c50..a81b314f 100644
--- a/taskcluster/test-training-extra_8k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training-extra_8k-linux-amd64-py36m-opt.yml
@@ -7,6 +7,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-extra-tests.sh 3.6.10:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 8kHz all training features Py3.7"
     description: "Training (all features) a DeepSpeech LDC93S1 model for Linux/AMD64 8kHz Python 3.7, CPU only, optimized version"
diff --git a/taskcluster/test-training-extra_8k-linux-amd64-py37m-opt.yml b/taskcluster/test-training-extra_8k-linux-amd64-py37m-opt.yml
index 32edde28..326b735c 100644
--- a/taskcluster/test-training-extra_8k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training-extra_8k-linux-amd64-py37m-opt.yml
@@ -7,6 +7,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-extra-tests.sh 3.7.6:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 8kHz all training features Py3.7"
     description: "Training (all features) a DeepSpeech LDC93S1 model for Linux/AMD64 8kHz Python 3.7, CPU only, optimized version"
diff --git a/taskcluster/test-training-pypi_16k-linux-amd64-py35m-opt.yml b/taskcluster/test-training-pypi_16k-linux-amd64-py35m-opt.yml
index 67a14191..dc169b6b 100644
--- a/taskcluster/test-training-pypi_16k-linux-amd64-py35m-opt.yml
+++ b/taskcluster/test-training-pypi_16k-linux-amd64-py35m-opt.yml
@@ -10,6 +10,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.5.8:m 16k --pypi"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 16kHz PyPI training Py3.5"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 16kHz Python 3.5, CPU only, optimized version, decoder package from PyPI"
diff --git a/taskcluster/test-training-pypi_16k-linux-amd64-py36m-opt.yml b/taskcluster/test-training-pypi_16k-linux-amd64-py36m-opt.yml
index f2909aa1..a8d9fca3 100644
--- a/taskcluster/test-training-pypi_16k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training-pypi_16k-linux-amd64-py36m-opt.yml
@@ -10,6 +10,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.10:m 16k --pypi"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 16kHz PyPI training Py3.6"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 16kHz Python 3.6, CPU only, optimized version, decoder package from PyPI"
diff --git a/taskcluster/test-training-pypi_16k-linux-amd64-py37m-opt.yml b/taskcluster/test-training-pypi_16k-linux-amd64-py37m-opt.yml
index c3b8282a..3cfdf99d 100644
--- a/taskcluster/test-training-pypi_16k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training-pypi_16k-linux-amd64-py37m-opt.yml
@@ -10,6 +10,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.7.6:m 16k --pypi"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 16kHz PyPI training Py3.7"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 16kHz Python 3.7, CPU only, optimized version, decoder package from PyPI"
diff --git a/taskcluster/test-training-pypi_8k-linux-amd64-py36m-opt.yml b/taskcluster/test-training-pypi_8k-linux-amd64-py36m-opt.yml
index 78029d23..37ecd686 100644
--- a/taskcluster/test-training-pypi_8k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training-pypi_8k-linux-amd64-py36m-opt.yml
@@ -10,6 +10,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.10:m 8k --pypi"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 8kHz PyPI training Py3.6"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 8kHz Python 3.6, CPU only, optimized version, decoder package from PyPI"
diff --git a/taskcluster/test-training-pypi_8k-linux-amd64-py37m-opt.yml b/taskcluster/test-training-pypi_8k-linux-amd64-py37m-opt.yml
index c044a550..7a74389a 100644
--- a/taskcluster/test-training-pypi_8k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training-pypi_8k-linux-amd64-py37m-opt.yml
@@ -10,6 +10,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.7.6:m 8k  --pypi"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 8kHz PyPI training Py3.7"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 8kHz Python 3.7, CPU only, optimized version, decoder package from PyPI"
diff --git a/taskcluster/test-training-unittests_8k-linux-amd64-py35m-opt.yml b/taskcluster/test-training-unittests_8k-linux-amd64-py35m-opt.yml
index 3bd4c39d..39d23d29 100644
--- a/taskcluster/test-training-unittests_8k-linux-amd64-py35m-opt.yml
+++ b/taskcluster/test-training-unittests_8k-linux-amd64-py35m-opt.yml
@@ -1,12 +1,13 @@
 build:
-    template_file: test-linux-opt-base.tyml
-    dependencies:
-      - "linux-amd64-ctc-opt"
-    system_setup:
-      >
-        apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
-    args:
-      tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-unittests.sh 3.5.8:m"
-    metadata:
-      name: "DeepSpeech on Linux AMD64 CPU training unittests using Python 3.5"
-      description: "Training unittests DeepSpeech LDC93S1 model for Linux/AMD64 using Python 3.5, for CPU only, and optimized version"
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-ctc-opt"
+  system_setup:
+    >
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-unittests.sh 3.5.8:m"
+  workerType: "${docker.dsTests}"
+  metadata:
+    name: "DeepSpeech on Linux AMD64 CPU training unittests using Python 3.5"
+    description: "Training unittests DeepSpeech LDC93S1 model for Linux/AMD64 using Python 3.5, for CPU only, and optimized version"
diff --git a/taskcluster/test-training-unittests_8k-linux-amd64-py36m-opt.yml b/taskcluster/test-training-unittests_8k-linux-amd64-py36m-opt.yml
index a4949830..e89afa20 100644
--- a/taskcluster/test-training-unittests_8k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training-unittests_8k-linux-amd64-py36m-opt.yml
@@ -1,13 +1,14 @@
 build:
-    template_file: test-linux-opt-base.tyml
-    dependencies:
-      - "linux-amd64-ctc-opt"
-    system_setup:
-      >
-        apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
-    args:
-      tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-unittests.sh 3.6.10:m"
-    metadata:
-      name: "DeepSpeech on Linux AMD64 CPU training unittests using Python 3.6"
-      description: "Training unittests DeepSpeech LDC93S1 model for Linux/AMD64 using Python 3.6, for CPU only, and optimized version"
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-ctc-opt"
+  system_setup:
+    >
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-unittests.sh 3.6.10:m"
+  workerType: "${docker.dsTests}"
+  metadata:
+    name: "DeepSpeech on Linux AMD64 CPU training unittests using Python 3.6"
+    description: "Training unittests DeepSpeech LDC93S1 model for Linux/AMD64 using Python 3.6, for CPU only, and optimized version"
  
diff --git a/taskcluster/test-training-unittests_8k-linux-amd64-py37m-opt.yml b/taskcluster/test-training-unittests_8k-linux-amd64-py37m-opt.yml
index 5b9ff7a5..a63b434b 100644
--- a/taskcluster/test-training-unittests_8k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training-unittests_8k-linux-amd64-py37m-opt.yml
@@ -1,12 +1,13 @@
 build:
-    template_file: test-linux-opt-base.tyml
-    dependencies:
-      - "linux-amd64-ctc-opt"
-    system_setup:
-      >
-        apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
-    args:
-      tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-unittests.sh 3.7.6:m"
-    metadata:
-      name: "DeepSpeech on Linux AMD64 CPU training unittests using Python 3.7"
-      description: "Training unittests DeepSpeech LDC93S1 model for Linux/AMD64 using Python 3.7, for CPU only, and optimized version"
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-ctc-opt"
+  system_setup:
+    >
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-unittests.sh 3.7.6:m"
+  workerType: "${docker.dsTests}"
+  metadata:
+    name: "DeepSpeech on Linux AMD64 CPU training unittests using Python 3.7"
+    description: "Training unittests DeepSpeech LDC93S1 model for Linux/AMD64 using Python 3.7, for CPU only, and optimized version"
diff --git a/taskcluster/test-training_16k-linux-amd64-py35m-opt.yml b/taskcluster/test-training_16k-linux-amd64-py35m-opt.yml
index 5e5e2f0a..b7527391 100644
--- a/taskcluster/test-training_16k-linux-amd64-py35m-opt.yml
+++ b/taskcluster/test-training_16k-linux-amd64-py35m-opt.yml
@@ -7,6 +7,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.5.8:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 16kHz basic training Py3.5"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 16kHz Python 3.5, CPU only, optimized version"
diff --git a/taskcluster/test-training_16k-linux-amd64-py36m-opt.yml b/taskcluster/test-training_16k-linux-amd64-py36m-opt.yml
index 7f19771d..b8a43afc 100644
--- a/taskcluster/test-training_16k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training_16k-linux-amd64-py36m-opt.yml
@@ -7,6 +7,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.10:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 16kHz basic training Py3.6"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 16kHz Python 3.6, CPU only, optimized version"
diff --git a/taskcluster/test-training_16k-linux-amd64-py37m-opt.yml b/taskcluster/test-training_16k-linux-amd64-py37m-opt.yml
index 4146dfca..514c3bda 100644
--- a/taskcluster/test-training_16k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training_16k-linux-amd64-py37m-opt.yml
@@ -7,6 +7,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.7.6:m 16k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 16kHz basic training Py3.7"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 16kHz Python 3.7, CPU only, optimized version"
diff --git a/taskcluster/test-training_8k-linux-amd64-py36m-opt.yml b/taskcluster/test-training_8k-linux-amd64-py36m-opt.yml
index 560ffcfb..3e3a10a9 100644
--- a/taskcluster/test-training_8k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training_8k-linux-amd64-py36m-opt.yml
@@ -7,6 +7,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.10:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 8kHz basic training Py3.6"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 8kHz Python 3.6, CPU only, optimized version"
diff --git a/taskcluster/test-training_8k-linux-amd64-py37m-opt.yml b/taskcluster/test-training_8k-linux-amd64-py37m-opt.yml
index 09bfd129..b2f9c9ab 100644
--- a/taskcluster/test-training_8k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training_8k-linux-amd64-py37m-opt.yml
@@ -7,6 +7,7 @@ build:
       apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.7.6:m 8k"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU 8kHz basic training Py3.7"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 8kHz Python 3.7, CPU only, optimized version"
diff --git a/taskcluster/test-transfer-linux-amd64-py36m-opt.yml b/taskcluster/test-transfer-linux-amd64-py36m-opt.yml
index e94101ea..85e5fe8c 100644
--- a/taskcluster/test-transfer-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-transfer-linux-amd64-py36m-opt.yml
@@ -4,6 +4,7 @@ build:
     - "linux-amd64-ctc-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-transfer-tests.sh 3.6.10:m"
+  workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU transfer learning Py3.6"
     description: "Training a DeepSpeech LDC93S1 model with transfer learning for Linux/AMD64 16kHz Python 3.6, CPU only, optimized version"
diff --git a/taskcluster/tf_android-arm64-opt.yml b/taskcluster/tf_android-arm64-opt.yml
index 1b9d93ca..e0f2170e 100644
--- a/taskcluster/tf_android-arm64-opt.yml
+++ b/taskcluster/tf_android-arm64-opt.yml
@@ -11,6 +11,7 @@ build:
     build: "taskcluster/tf_tc-build.sh --android-arm64"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
   metadata:
     name: "TensorFlow Android ARM64"
     description: "Building TensorFlow for Android ARM64, optimized version"
diff --git a/taskcluster/tf_android-armv7-opt.yml b/taskcluster/tf_android-armv7-opt.yml
index ec28464c..07091d69 100644
--- a/taskcluster/tf_android-armv7-opt.yml
+++ b/taskcluster/tf_android-armv7-opt.yml
@@ -11,6 +11,7 @@ build:
     build: "taskcluster/tf_tc-build.sh --android-armv7"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
   metadata:
     name: "TensorFlow Android ARMv7"
     description: "Building TensorFlow for Android ARMv7, optimized version"
diff --git a/taskcluster/tf_linux-amd64-cpu-opt.yml b/taskcluster/tf_linux-amd64-cpu-opt.yml
index 36b051b1..df4c29b0 100644
--- a/taskcluster/tf_linux-amd64-cpu-opt.yml
+++ b/taskcluster/tf_linux-amd64-cpu-opt.yml
@@ -11,6 +11,7 @@ build:
     build: "taskcluster/tf_tc-build.sh --cpu"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
   metadata:
     name: "TensorFlow Linux AMD64 CPU"
     description: "Building TensorFlow for Linux/AMD64, CPU only, optimized version"
diff --git a/taskcluster/tf_linux-amd64-gpu-opt.yml b/taskcluster/tf_linux-amd64-gpu-opt.yml
index 38e94808..53037435 100644
--- a/taskcluster/tf_linux-amd64-gpu-opt.yml
+++ b/taskcluster/tf_linux-amd64-gpu-opt.yml
@@ -11,6 +11,7 @@ build:
     build: "taskcluster/tf_tc-build.sh --gpu"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
   metadata:
     name: "TensorFlow Linux AMD64 CUDA"
     description: "Building TensorFlow for Linux/AMD64, CUDA-enabled, optimized version"
diff --git a/taskcluster/tf_linux-arm64-cpu-opt.yml b/taskcluster/tf_linux-arm64-cpu-opt.yml
index a17b3629..11c5a8c0 100644
--- a/taskcluster/tf_linux-arm64-cpu-opt.yml
+++ b/taskcluster/tf_linux-arm64-cpu-opt.yml
@@ -11,6 +11,7 @@ build:
     build: "taskcluster/tf_tc-build.sh --arm64"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
   metadata:
     name: "TensorFlow Linux ARM64 Cortex-A53 CPU"
     description: "Building TensorFlow for Linux ARM64 Cortex-A53, CPU only, optimized version"
diff --git a/taskcluster/tf_linux-rpi3-cpu-opt.yml b/taskcluster/tf_linux-rpi3-cpu-opt.yml
index 579c42c9..5c39e53a 100644
--- a/taskcluster/tf_linux-rpi3-cpu-opt.yml
+++ b/taskcluster/tf_linux-rpi3-cpu-opt.yml
@@ -11,6 +11,7 @@ build:
     build: "taskcluster/tf_tc-build.sh --arm"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
   metadata:
     name: "TensorFlow Linux RPi3/ARMv7 CPU"
     description: "Building TensorFlow for Linux RPi3 ARMv7, CPU only, optimized version"
diff --git a/taskcluster/worker.cyml b/taskcluster/worker.cyml
index 55315910..348b6280 100644
--- a/taskcluster/worker.cyml
+++ b/taskcluster/worker.cyml
@@ -2,7 +2,6 @@ taskcluster:
   schedulerId: taskcluster-github
   docker:
     provisionerId: proj-deepspeech
-    workerType: ci
     workerTypeKvm: kvm
     workerTypeWin: win
     workerTypeCuda: win-gpu