diff --git a/taskcluster/examples-ffmpeg_vad_streaming-node10.yml b/taskcluster/examples-ffmpeg_vad_streaming-node10.yml
index 294cf46a..52bded9b 100644
--- a/taskcluster/examples-ffmpeg_vad_streaming-node10.yml
+++ b/taskcluster/examples-ffmpeg_vad_streaming-node10.yml
@@ -2,7 +2,7 @@ build:
   template_file: examples-base.tyml
   docker_image: "node:10"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       apt-get -qq -y install ffmpeg
diff --git a/taskcluster/examples-ffmpeg_vad_streaming-node8.yml b/taskcluster/examples-ffmpeg_vad_streaming-node8.yml
index 8decd1e6..5518ab73 100644
--- a/taskcluster/examples-ffmpeg_vad_streaming-node8.yml
+++ b/taskcluster/examples-ffmpeg_vad_streaming-node8.yml
@@ -2,7 +2,7 @@ build:
   template_file: examples-base.tyml
   docker_image: "node:8"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       apt-get -qq -y install ffmpeg
diff --git a/taskcluster/examples-nodejs_wav-node10.yml b/taskcluster/examples-nodejs_wav-node10.yml
index 0efb90dd..5ac4f974 100644
--- a/taskcluster/examples-nodejs_wav-node10.yml
+++ b/taskcluster/examples-nodejs_wav-node10.yml
@@ -2,7 +2,7 @@ build:
   template_file: examples-base.tyml
   docker_image: "node:10"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/examples/nodejs_wav/test.sh"
   metadata:
diff --git a/taskcluster/examples-nodejs_wav-node8.yml b/taskcluster/examples-nodejs_wav-node8.yml
index 7cc359a6..198872ea 100644
--- a/taskcluster/examples-nodejs_wav-node8.yml
+++ b/taskcluster/examples-nodejs_wav-node8.yml
@@ -2,7 +2,7 @@ build:
   template_file: examples-base.tyml
   docker_image: "node:8"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/examples/nodejs_wav/test.sh"
   metadata:
diff --git a/taskcluster/tc-electron-tests.sh b/taskcluster/tc-electron-tests.sh
index 9e0dff45..8318a522 100755
--- a/taskcluster/tc-electron-tests.sh
+++ b/taskcluster/tc-electron-tests.sh
@@ -29,7 +29,8 @@ export PATH="${NODE_ROOT}:${NODE_PATH}/.bin/:${NODE_PATH}/electron/dist/:$PATH"
 
 npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} electron@${electronver}
 
-npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${DEEPSPEECH_NODEJS}/deepspeech-${DS_VERSION}.tgz
+deepspeech_npm_url=$(get_dep_npm_pkg_url)
+npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 if [ "${OS}" = "Darwin" ]; then
   ln -s Electron.app/Contents/MacOS/Electron "${NODE_ROOT}/node_modules/electron/dist/node"
diff --git a/taskcluster/tc-node-tests-prod.sh b/taskcluster/tc-node-tests-prod.sh
index a188e302..b03f7e91 100644
--- a/taskcluster/tc-node-tests-prod.sh
+++ b/taskcluster/tc-node-tests-prod.sh
@@ -27,7 +27,8 @@ NODE_CACHE="${DS_ROOT_TASK}/ds-test.cache/"
 export NODE_PATH="${NODE_ROOT}/node_modules/"
 export PATH="${NODE_ROOT}:${NODE_PATH}/.bin/:$PATH"
 
-npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${DEEPSPEECH_NODEJS}/deepspeech-${DS_VERSION}.tgz
+deepspeech_npm_url=$(get_dep_npm_pkg_url)
+npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 check_runtime_nodejs
 
diff --git a/taskcluster/tc-node-tests.sh b/taskcluster/tc-node-tests.sh
index 71c9f2f8..b53002e8 100644
--- a/taskcluster/tc-node-tests.sh
+++ b/taskcluster/tc-node-tests.sh
@@ -21,7 +21,8 @@ NODE_CACHE="${DS_ROOT_TASK}/ds-test.cache/"
 export NODE_PATH="${NODE_ROOT}/node_modules/"
 export PATH="${NODE_ROOT}:${NODE_PATH}/.bin/:$PATH"
 
-npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${DEEPSPEECH_NODEJS}/deepspeech-${DS_VERSION}.tgz
+deepspeech_npm_url=$(get_dep_npm_pkg_url)
+npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 check_runtime_nodejs
 
diff --git a/taskcluster/tc-node_tflite-tests.sh b/taskcluster/tc-node_tflite-tests.sh
index 77b5f71c..c5a27c21 100644
--- a/taskcluster/tc-node_tflite-tests.sh
+++ b/taskcluster/tc-node_tflite-tests.sh
@@ -25,7 +25,8 @@ NODE_CACHE="${DS_ROOT_TASK}/ds-test.cache/"
 export NODE_PATH="${NODE_ROOT}/node_modules/"
 export PATH="${NODE_ROOT}:${NODE_PATH}/.bin/:$PATH"
 
-npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${DEEPSPEECH_NODEJS}/deepspeech-${DS_VERSION}.tgz
+deepspeech_npm_url=$(get_dep_npm_pkg_url)
+npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 check_runtime_nodejs
 
diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh
index b898c4db..c60e7ff0 100755
--- a/taskcluster/tc-tests-utils.sh
+++ b/taskcluster/tc-tests-utils.sh
@@ -1080,6 +1080,25 @@ get_python_pkg_url()
   echo "${root}/${deepspeech_pkg}"
 }
 
+# Will inspect this task's dependencies for one that provides a matching npm package
+get_dep_npm_pkg_url()
+{
+  local all_deps="$(curl -s https://community-tc.services.mozilla.com/api/queue/v1/task/${TASK_ID} | python -c 'import json; import sys; print(" ".join(json.loads(sys.stdin.read())["dependencies"]));')"
+  local deepspeech_pkg="deepspeech-${DS_VERSION}.tgz"
+
+  for dep in ${all_deps}; do
+    local has_artifact=$(curl -s https://community-tc.services.mozilla.com/api/queue/v1/task/${dep}/artifacts | python -c 'import json; import sys; has_artifact = True in [ e["name"].find("'${deepspeech_pkg}'") > 0 for e in json.loads(sys.stdin.read())["artifacts"] ]; print(has_artifact)')
+    if [ "${has_artifact}" = "True" ]; then
+      echo "https://community-tc.services.mozilla.com/api/queue/v1/task/${dep}/artifacts/public/${deepspeech_pkg}"
+      exit 0
+    fi;
+  done;
+
+  echo ""
+  # This should not be reached, otherwise it means we could not find a matching nodejs package
+  exit 1
+}
+
 extract_python_versions()
 {
   # call extract_python_versions ${pyver_full} pyver pyver_pkg py_unicode_type pyconf pyalias
diff --git a/taskcluster/test-armbian-opt-base.tyml b/taskcluster/test-armbian-opt-base.tyml
index a8727169..9e3850de 100644
--- a/taskcluster/test-armbian-opt-base.tyml
+++ b/taskcluster/test-armbian-opt-base.tyml
@@ -33,10 +33,8 @@ then:
       $let:
         training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
         linux_arm64_build: { $eval: as_slugid("linux-arm64-cpu-opt") }
-        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
       in:
         DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_arm64_build}/artifacts/public
-        DEEPSPEECH_NODEJS: https://community-tc.services.mozilla.com/api/queue/v1/task/${node_package_cpu}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
         DEEPSPEECH_PROD_MODEL: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pb
         DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pbmm
@@ -52,7 +50,7 @@ then:
       - $let:
           extraSystemSetup: { $eval: strip(str(build.system_setup)) }
         in: >
-          apt-get -qq update && apt-get -qq -y install git gnupg pixz sox sudo wget libatlas3-base libopenblas-base xxd && ${extraSystemSetup} &&
+          apt-get -qq update && apt-get -qq -y install curl python-simplejson git gnupg pixz sox sudo wget libatlas3-base libopenblas-base xxd && ${extraSystemSetup} &&
           adduser --system --home ${system.homedir.linux} ${system.username} &&
           cd ${system.homedir.linux} &&
           echo -e "#!/bin/bash\nset -xe\n env && id && mkdir ~/DeepSpeech/ && git clone --quiet ${event.head.repo.url} ~/DeepSpeech/ds/ && cd ~/DeepSpeech/ds && git checkout --quiet ${event.head.sha}" > /tmp/clone.sh && chmod +x /tmp/clone.sh &&
diff --git a/taskcluster/test-darwin-opt-base.tyml b/taskcluster/test-darwin-opt-base.tyml
index 99ed71cd..3ff15b77 100644
--- a/taskcluster/test-darwin-opt-base.tyml
+++ b/taskcluster/test-darwin-opt-base.tyml
@@ -37,11 +37,9 @@ then:
         training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
         darwin_amd64_build: { $eval: as_slugid("darwin-amd64-cpu-opt") }
         darwin_amd64_tflite: { $eval: as_slugid("darwin-amd64-tflite-opt") }
-        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
       in:
         DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${darwin_amd64_build}/artifacts/public
         DEEPSPEECH_ARTIFACTS_TFLITE_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${darwin_amd64_tflite}/artifacts/public
-        DEEPSPEECH_NODEJS: https://community-tc.services.mozilla.com/api/queue/v1/task/${node_package_cpu}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
         DEEPSPEECH_PROD_MODEL: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pb
         DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pbmm
diff --git a/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml
index 59deb3bb..7d7690d7 100644
--- a/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml b/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml
index a12fc6ce..9e64dd8c 100644
--- a/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml
index af3a7cf5..9b859a89 100644
--- a/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml
index ad0dcfa5..a37a2772 100644
--- a/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml
index 71c6c1db..9f451581 100644
--- a/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml
index b1076ea1..6dd8d9dd 100644
--- a/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml
index 62ab14e3..1bef15c7 100644
--- a/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml
index b685864d..ca434d92 100644
--- a/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml
index 43705b93..0bc4363f 100644
--- a/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml
index c9465cb3..628fae3a 100644
--- a/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml
index 56aecc8d..76a5239b 100644
--- a/taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml
index 06603665..c668fe59 100644
--- a/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml
index 76962e92..48d0c0f9 100644
--- a/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml
index a8164797..2328d041 100644
--- a/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml
index dcd35587..b8b102f5 100644
--- a/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml
index de046091..084280cf 100644
--- a/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml
index f875fe6b..1d1c8fad 100644
--- a/taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml
index f49b9f4a..8bc4d556 100644
--- a/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml
index ab74503f..5fc12199 100644
--- a/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py35m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml
index 82108159..f04c7f1b 100644
--- a/taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py35m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml
index 23dc8f8e..a9fa5b7f 100644
--- a/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py35m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-linux-opt-base.tyml b/taskcluster/test-linux-opt-base.tyml
index 4efeedda..63b0d6b7 100644
--- a/taskcluster/test-linux-opt-base.tyml
+++ b/taskcluster/test-linux-opt-base.tyml
@@ -35,13 +35,11 @@ then:
         linux_amd64_build: { $eval: as_slugid("linux-amd64-cpu-opt") }
         linux_amd64_tflite: { $eval: as_slugid("linux-amd64-tflite-opt") }
         linux_amd64_ctc: { $eval: as_slugid("linux-amd64-ctc-opt") }
-        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
       in:
         CONVERT_GRAPHDEF_MEMMAPPED: ${build.convert_graphdef}
         BENCHMARK_MODEL_BIN: ${build.benchmark_model_bin}
         DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_amd64_build}/artifacts/public
         DEEPSPEECH_ARTIFACTS_TFLITE_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_amd64_tflite}/artifacts/public
-        DEEPSPEECH_NODEJS: https://community-tc.services.mozilla.com/api/queue/v1/task/${node_package_cpu}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
         DEEPSPEECH_PROD_MODEL: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pb
         DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pbmm
@@ -57,7 +55,7 @@ then:
           extraSystemSetup: { $eval: strip(str(build.system_setup)) }
         in: >
           ${aptEc2Mirrors} &&
-          apt-get -qq update && apt-get -qq -y install git pixz sox sudo wget && ${extraSystemSetup} &&
+          apt-get -qq update && apt-get -qq -y install curl python-simplejson git pixz sox sudo wget && ${extraSystemSetup} &&
           adduser --system --home ${system.homedir.linux} ${system.username} &&
           cd ${system.homedir.linux} &&
           echo -e "#!/bin/bash\nset -xe\n env && id && mkdir ~/DeepSpeech/ && git clone --quiet ${event.head.repo.url} ~/DeepSpeech/ds/ && cd ~/DeepSpeech/ds && git checkout --quiet ${event.head.sha}" > /tmp/clone.sh && chmod +x /tmp/clone.sh &&
diff --git a/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml
index 96e3c58a..26f6370c 100644
--- a/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-arm64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml
index c48b9a0c..9142b2b3 100644
--- a/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_10x-linux-amd64-opt.yml b/taskcluster/test-nodejs_10x-linux-amd64-opt.yml
index dc557eac..58c18ea3 100644
--- a/taskcluster/test-nodejs_10x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_10x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_10x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_10x-linux-amd64-prod_pbmodel-opt.yml
index acee5114..27546de4 100644
--- a/taskcluster/test-nodejs_10x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_10x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
diff --git a/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml
index e748ae5e..105645a7 100644
--- a/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-rpi3-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_10x-win-amd64-opt.yml b/taskcluster/test-nodejs_10x-win-amd64-opt.yml
index df0aaa26..9f69677b 100644
--- a/taskcluster/test-nodejs_10x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_10x-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml
index 7219045b..40f69c1d 100644
--- a/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-arm64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml
index b25d5e58..7be86b9e 100644
--- a/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_11x-linux-amd64-opt.yml b/taskcluster/test-nodejs_11x-linux-amd64-opt.yml
index 33c21ee1..ab276400 100644
--- a/taskcluster/test-nodejs_11x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_11x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_11x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_11x-linux-amd64-prod_pbmodel-opt.yml
index ff781071..27e7fe0e 100644
--- a/taskcluster/test-nodejs_11x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_11x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
diff --git a/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml
index a89f01f0..bb539555 100644
--- a/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-rpi3-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_11x-win-amd64-opt.yml b/taskcluster/test-nodejs_11x-win-amd64-opt.yml
index b5f34600..6e0e6869 100644
--- a/taskcluster/test-nodejs_11x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_11x-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml
index 8f7c692b..09b8e7fd 100644
--- a/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-arm64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml
index 42ebeab4..a7ee6457 100644
--- a/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_12x-linux-amd64-opt.yml b/taskcluster/test-nodejs_12x-linux-amd64-opt.yml
index 43f3d077..df7255b5 100644
--- a/taskcluster/test-nodejs_12x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_12x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_12x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_12x-linux-amd64-prod_pbmodel-opt.yml
index f10161ae..97013655 100644
--- a/taskcluster/test-nodejs_12x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_12x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
diff --git a/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml
index 34c39821..136ab5c2 100644
--- a/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-rpi3-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_12x-win-amd64-opt.yml b/taskcluster/test-nodejs_12x-win-amd64-opt.yml
index 753df63b..cc1b84b5 100644
--- a/taskcluster/test-nodejs_12x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_12x-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml
index 8cf9a841..17729c25 100644
--- a/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-arm64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml
index 23ec0371..5558cff1 100644
--- a/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_13x-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x-linux-amd64-opt.yml
index 4df7a6c3..fb581065 100644
--- a/taskcluster/test-nodejs_13x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml
index 08facade..b0b02e9c 100644
--- a/taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
diff --git a/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml
index ee555515..55b47274 100644
--- a/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-rpi3-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_13x-win-amd64-opt.yml b/taskcluster/test-nodejs_13x-win-amd64-opt.yml
index d275d15a..56164dbe 100644
--- a/taskcluster/test-nodejs_13x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-armbian-arm64-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-armbian-arm64-opt.yml
new file mode 100644
index 00000000..fdda9b79
--- /dev/null
+++ b/taskcluster/test-nodejs_13x_multiarchpkg-armbian-arm64-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-armbian-opt-base.tyml
+  dependencies:
+    - "node-package-cpu"
+    - "test-training_upstream-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_buster.prep_13} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x"
+  metadata:
+    name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS MultiArch Package 13.x tests"
+    description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS MultiArch Package v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-darwin-amd64-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-darwin-amd64-opt.yml
new file mode 100644
index 00000000..9f65a700
--- /dev/null
+++ b/taskcluster/test-nodejs_13x_multiarchpkg-darwin-amd64-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-darwin-opt-base.tyml
+  dependencies:
+    - "node-package-cpu"
+    - "test-training_upstream-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.brew.setup} && ${nodejs.brew.prep_13} && ${nodejs.brew.env}
+  args:
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x"
+  metadata:
+    name: "DeepSpeech OSX AMD64 CPU NodeJS MultiArch Package 13.x tests"
+    description: "Testing DeepSpeech for OSX/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-opt.yml
new file mode 100644
index 00000000..ee1b0315
--- /dev/null
+++ b/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "node-package-cpu"
+    - "test-training_upstream-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${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"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x tests"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
new file mode 100644
index 00000000..6089b016
--- /dev/null
+++ b/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "node-package-cpu"
+  system_setup:
+    >
+      ${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"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x prod tests"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x on prod model, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-raspbian-rpi3-opt.yml
new file mode 100644
index 00000000..5f259faa
--- /dev/null
+++ b/taskcluster/test-nodejs_13x_multiarchpkg-raspbian-rpi3-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-raspbian-opt-base.tyml
+  dependencies:
+    - "node-package-cpu"
+    - "test-training_upstream-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_buster.prep_13} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 13.x"
+  metadata:
+    name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS MultiArch Package 13.x tests"
+    description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS MultiArch Package v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-win-amd64-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-win-amd64-opt.yml
new file mode 100644
index 00000000..52ed8ecb
--- /dev/null
+++ b/taskcluster/test-nodejs_13x_multiarchpkg-win-amd64-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-win-opt-base.tyml
+  dependencies:
+    - "node-package-cpu"
+    - "test-training_upstream-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${system.sox_win} && ${nodejs.win.prep_13}
+  args:
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x"
+  metadata:
+    name: "DeepSpeech Windows AMD64 CPU NodeJS MultiArch Package 13.x tests"
+    description: "Testing DeepSpeech for Windows/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml
index 72ed149a..c505d33f 100644
--- a/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-arm64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
index f603e360..d27cdd00 100644
--- a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml b/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
index 870096ea..2fb698b8 100644
--- a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml
index 81a8f78e..96cb2a4b 100644
--- a/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
diff --git a/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml
index c5b446c9..8e587ef5 100644
--- a/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-rpi3-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_4x-win-amd64-opt.yml b/taskcluster/test-nodejs_4x-win-amd64-opt.yml
index 2577acff..ce98586f 100644
--- a/taskcluster/test-nodejs_4x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
index 9aefb73c..1871888f 100644
--- a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml b/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
index 2648cdbc..8ce05024 100644
--- a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml
index 70408683..c6353ef9 100644
--- a/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
diff --git a/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml
index d3c4cf77..7dede288 100644
--- a/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-arm64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
index af1ac779..3bf7a049 100644
--- a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml b/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
index de450230..6d3b5cef 100644
--- a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml
index b06654c6..70ab2539 100644
--- a/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
diff --git a/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml
index 0ac305a9..cd422ed4 100644
--- a/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-rpi3-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_6x-win-amd64-opt.yml b/taskcluster/test-nodejs_6x-win-amd64-opt.yml
index 290f8fe5..20124be4 100644
--- a/taskcluster/test-nodejs_6x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml
index 7a7d063f..ec565d5d 100644
--- a/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-arm64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
index 90a3d9e0..e03494d2 100644
--- a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml b/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
index 0f665a18..c473cf80 100644
--- a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml
index 1ad67430..84cbcdf0 100644
--- a/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
diff --git a/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml
index a15d961b..0a9856bc 100644
--- a/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-rpi3-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_7x-win-amd64-opt.yml b/taskcluster/test-nodejs_7x-win-amd64-opt.yml
index 722453ab..b9cf1be9 100644
--- a/taskcluster/test-nodejs_7x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml
index e1b3772f..446fc3c0 100644
--- a/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-arm64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
index 2162204f..ccd77ef5 100644
--- a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml b/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
index 5e70e5e8..c1b06aa3 100644
--- a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml
index 76b0d9b2..72e9473e 100644
--- a/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
diff --git a/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml
index 5064068d..1d9ed4ce 100644
--- a/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-rpi3-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_8x-win-amd64-opt.yml b/taskcluster/test-nodejs_8x-win-amd64-opt.yml
index b1324114..61083841 100644
--- a/taskcluster/test-nodejs_8x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml
index d8db0e0f..98510059 100644
--- a/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-arm64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
index 145ad277..858c8aae 100644
--- a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml b/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
index a304b2fc..1a05ee2c 100644
--- a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml
index 694c3576..5e37ed18 100644
--- a/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
diff --git a/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml
index 44fbaa7a..d539fe0b 100644
--- a/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "linux-rpi3-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-nodejs_9x-win-amd64-opt.yml b/taskcluster/test-nodejs_9x-win-amd64-opt.yml
index 6025a976..872140f7 100644
--- a/taskcluster/test-nodejs_9x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
diff --git a/taskcluster/test-raspbian-opt-base.tyml b/taskcluster/test-raspbian-opt-base.tyml
index 6e4d1138..f47b020d 100644
--- a/taskcluster/test-raspbian-opt-base.tyml
+++ b/taskcluster/test-raspbian-opt-base.tyml
@@ -33,10 +33,8 @@ then:
       $let:
         training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
         linux_rpi3_build: { $eval: as_slugid("linux-rpi3-cpu-opt") }
-        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
       in:
         DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_rpi3_build}/artifacts/public
-        DEEPSPEECH_NODEJS: https://community-tc.services.mozilla.com/api/queue/v1/task/${node_package_cpu}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
         DEEPSPEECH_PROD_MODEL: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pb
         DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pbmm
@@ -52,7 +50,7 @@ then:
       - $let:
           extraSystemSetup: { $eval: strip(str(build.system_setup)) }
         in: >
-          apt-get -qq update && apt-get -qq -y install git pixz sox wget libatlas3-base xxd && ${extraSystemSetup} &&
+          apt-get -qq update && apt-get -qq -y install curl python-simplejson git pixz sox wget libatlas3-base xxd && ${extraSystemSetup} &&
           adduser --system --home ${system.homedir.linux} ${system.username} &&
           cd ${system.homedir.linux} &&
           echo -e "#!/bin/bash\nset -xe\n env && id && mkdir ~/DeepSpeech/ && git clone --quiet ${event.head.repo.url} ~/DeepSpeech/ds/ && cd ~/DeepSpeech/ds && git checkout --quiet ${event.head.sha}" > /tmp/clone.sh && chmod +x /tmp/clone.sh &&
diff --git a/taskcluster/test-win-opt-base.tyml b/taskcluster/test-win-opt-base.tyml
index 2000ccd4..82aeb0b6 100644
--- a/taskcluster/test-win-opt-base.tyml
+++ b/taskcluster/test-win-opt-base.tyml
@@ -39,11 +39,9 @@ then:
         training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
         win_amd64_build: { $eval: as_slugid("win-amd64-cpu-opt") }
         win_amd64_tflite: { $eval: as_slugid("win-amd64-tflite-opt") }
-        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
       in:
         DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${win_amd64_build}/artifacts/public
         DEEPSPEECH_ARTIFACTS_TFLITE_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${win_amd64_tflite}/artifacts/public
-        DEEPSPEECH_NODEJS: https://community-tc.services.mozilla.com/api/queue/v1/task/${node_package_cpu}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
         DEEPSPEECH_PROD_MODEL: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pb
         DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pbmm