diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
index d09d1a6ed9..c8b5a93d1e 100644
--- a/taskcluster/.shared.yml
+++ b/taskcluster/.shared.yml
@@ -27,10 +27,12 @@ nodejs:
     prep_10: 'echo "deb http://deb.nodesource.com/node_10.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
     prep_11: 'echo "deb http://deb.nodesource.com/node_11.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
     prep_12: 'echo "deb http://deb.nodesource.com/node_12.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
+    prep_13: 'echo "deb http://deb.nodesource.com/node_13.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
   packages_docs_bionic:
     apt: 'nodejs'
     apt_pinning: '(echo "Package: nodejs" && echo "Pin: origin deb.nodesource.com" && echo "Pin-Priority: 999") > /etc/apt/preferences'
     prep_12: 'echo "deb http://deb.nodesource.com/node_12.x bionic main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
+    prep_13: 'echo "deb http://deb.nodesource.com/node_13.x bionic main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
   packages_buster:
     apt: 'nodejs sox'
     apt_pinning: '(echo "Package: nodejs" && echo "Pin: origin deb.nodesource.com" && echo "Pin-Priority: 999") > /etc/apt/preferences'
@@ -43,6 +45,7 @@ nodejs:
     prep_10: 'echo "deb http://deb.nodesource.com/node_10.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
     prep_11: 'echo "deb http://deb.nodesource.com/node_11.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
     prep_12: 'echo "deb http://deb.nodesource.com/node_12.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
+    prep_13: 'echo "deb http://deb.nodesource.com/node_13.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
   brew:
     # Using 'nvm' from homebrew results in installing v0.33.6 which seems to
     # suffer from a bug making it unable to work as of now:
@@ -61,6 +64,7 @@ nodejs:
     prep_10: 'nvm install 10.16.0 && nvm use 10.16.0'
     prep_11: 'nvm install 11.15.0 && nvm use 11.15.0'
     prep_12: 'nvm install 12.5.0 && nvm use 12.5.0'
+    prep_13: 'nvm install 13.0.1 && nvm use 13.0.1'
   win:
     prep_4: '/usr/bin/wget.exe https://nodejs.org/dist/v4.9.1/node-v4.9.1-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v4.9.1-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v4.9.1-win-x64/:$PATH'
     prep_6: '/usr/bin/wget.exe https://nodejs.org/dist/v6.17.1/node-v6.17.1-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v6.17.1-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v6.17.1-win-x64/:$PATH'
@@ -70,6 +74,7 @@ nodejs:
     prep_10: '/usr/bin/wget.exe https://nodejs.org/dist/v10.16.0/node-v10.16.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v10.16.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v10.16.0-win-x64/:$PATH'
     prep_11: '/usr/bin/wget.exe https://nodejs.org/dist/v11.15.0/node-v11.15.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v11.15.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v11.15.0-win-x64/:$PATH'
     prep_12: '/usr/bin/wget.exe https://nodejs.org/dist/v12.5.0/node-v12.5.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v12.5.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v12.5.0-win-x64/:$PATH'
+    prep_13: '/usr/bin/wget.exe https://nodejs.org/dist/v13.0.1/node-v13.0.1-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v13.0.1-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v13.0.1-win-x64/:$PATH'
 ## swig -javascript requires swig >= 3.0.7 (14.04 provides 2.0.11)
 ## force 3.0.10 for nodejs V8 API compatibility
 swig:
diff --git a/taskcluster/examples-ffmpeg_vad_streaming-node10.yml b/taskcluster/examples-ffmpeg_vad_streaming-node10.yml
index 294cf46a65..52bded9bd6 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 8decd1e6bf..5518ab73c8 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 0efb90dda4..5ac4f97406 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 7cc359a6c8..198872ea68 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 9e0dff459b..8318a522f4 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 a188e302ad..b03f7e911d 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 71c9f2f8bb..b53002e856 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 77b5f71c71..c5a27c218e 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 fedd9a092c..c60e7ff08a 100755
--- a/taskcluster/tc-tests-utils.sh
+++ b/taskcluster/tc-tests-utils.sh
@@ -56,7 +56,7 @@ model_name_mmap="$(basename -s ".pb" "${model_source}").pbmm"
 model_source_mmap="$(dirname "${model_source}")/${model_name_mmap}"
 
 SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.16:ucs2 2.7.16:ucs4 3.4.10:ucs4 3.5.7:ucs4 3.6.8:ucs4 3.7.3:ucs4 3.8.0:ucs4}
-SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.9.1 5.12.0 6.17.1 7.10.1 8.16.0 9.11.2 10.16.0 11.15.0 12.5.0}
+SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.9.1 5.12.0 6.17.1 7.10.1 8.16.0 9.11.2 10.16.0 11.15.0 12.5.0 13.0.1}
 SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-1.6.18 1.7.16 1.8.8 2.0.18 3.0.16 3.1.11 4.0.3 4.1.5 4.2.5 5.0.6 6.0.11 7.0.1}
 
 strip() {
@@ -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 a8727169ea..9e3850def6 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 99ed71cd18..3ff15b77ea 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 59deb3bbbd..7d7690d71a 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 a12fc6ced1..9e64dd8c47 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 af3a7cf5a9..9b859a89b7 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 ad0dcfa5c2..a37a2772dd 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 71c6c1dbe6..9f4515811d 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 b1076ea1ef..6dd8d9dd1e 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 62ab14e388..1bef15c7e3 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 b685864df7..ca434d92b4 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 43705b93f0..0bc4363f5a 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 c9465cb394..628fae3a1d 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 56aecc8db2..76a5239b62 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 06603665da..c668fe5932 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 76962e9267..48d0c0f980 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 a8164797db..2328d041fd 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 dcd355876e..b8b102f5b6 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 de04609164..084280cf4c 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 f875fe6b14..1d1c8fadfa 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 f49b9f4a9b..8bc4d55662 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 ab74503fba..5fc1219918 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 821081592f..f04c7f1b49 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 23dc8f8ed2..a9fa5b7f31 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 4efeedda09..63b0d6b7a9 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 96e3c58aad..26f6370c0f 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 c48b9a0c2b..9142b2b35c 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 dc557eac99..58c18ea384 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 acee511417..27546de44b 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 e748ae5e2f..105645a71f 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 df0aaa26d2..9f69677b72 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 7219045b83..40f69c1d30 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 b25d5e58cc..7be86b9e05 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 33c21ee1a0..ab276400fc 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 ff78107179..27e7fe0ed8 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 a89f01f013..bb53955526 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 b5f34600ff..6e0e686968 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 8f7c692b66..09b8e7fd2d 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 42ebeab4cb..a7ee645715 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 43f3d077c9..df7255b5d7 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 f10161ae92..970136556e 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 34c39821a7..136ab5c2dc 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 753df63bef..cc1b84b563 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
new file mode 100644
index 0000000000..17729c250e
--- /dev/null
+++ b/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-armbian-opt-base.tyml
+  dependencies:
+    - "linux-arm64-cpu-opt"
+    - "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 13.x tests"
+    description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml
new file mode 100644
index 0000000000..5558cff1ca
--- /dev/null
+++ b/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-darwin-opt-base.tyml
+  dependencies:
+    - "darwin-amd64-cpu-opt"
+    - "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 13.x tests"
+    description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x-linux-amd64-opt.yml
new file mode 100644
index 0000000000..fb5810651b
--- /dev/null
+++ b/taskcluster/test-nodejs_13x-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "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 13.x tests"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml
new file mode 100644
index 0000000000..b0b02e9cf9
--- /dev/null
+++ b/taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "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}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x prod tests"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml
new file mode 100644
index 0000000000..55b47274e0
--- /dev/null
+++ b/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-raspbian-opt-base.tyml
+  dependencies:
+    - "linux-rpi3-cpu-opt"
+    - "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 13.x tests"
+    description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x-win-amd64-opt.yml b/taskcluster/test-nodejs_13x-win-amd64-opt.yml
new file mode 100644
index 0000000000..56164dbe21
--- /dev/null
+++ b/taskcluster/test-nodejs_13x-win-amd64-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-win-opt-base.tyml
+  dependencies:
+    - "win-amd64-cpu-opt"
+    - "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 13.x tests"
+    description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v13.x, CPU only, optimized version"
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 0000000000..fdda9b79ce
--- /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 0000000000..9f65a7002e
--- /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 0000000000..ee1b0315b0
--- /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 0000000000..6089b01629
--- /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 0000000000..5f259faa67
--- /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 0000000000..52ed8ecb5c
--- /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 72ed149a79..c505d33f64 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 f603e360aa..d27cdd008a 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 870096ea79..2fb698b8eb 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 81a8f78ee9..96cb2a4b94 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 c5b446c9f2..8e587ef582 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 2577acfff0..ce98586f0b 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 9aefb73c3b..1871888f24 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 2648cdbcae..8ce0502485 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 70408683d6..c6353ef9da 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 d3c4cf7731..7dede288b4 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 af1ac7792b..3bf7a04917 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 de450230f6..6d3b5cef16 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 b06654c6e8..70ab25392d 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 0ac305a9db..cd422ed451 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 290f8fe58a..20124be479 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 7a7d063f93..ec565d5d5c 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 90a3d9e09f..e03494d221 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 0f665a18e0..c473cf80ef 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 1ad67430e3..84cbcdf046 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 a15d961b34..0a9856bce9 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 722453aba9..b9cf1be92e 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 e1b3772f08..446fc3c095 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 2162204ff8..ccd77ef5e6 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 5e70e5e821..c1b06aa331 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 76b0d9b27a..72e9473e42 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 5064068d2b..1d9ed4ce53 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 b13241143f..61083841a4 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 d8db0e0fb9..98510059be 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 145ad27755..858c8aaedf 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 a304b2fc21..1a05ee2c9c 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 694c35763c..5e37ed18e7 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 44fbaa7a4f..d539fe0b2e 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 6025a976d3..872140f770 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 6e4d1138c2..f47b020d46 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 2000ccd462..82aeb0b652 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