diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml
index febb384e..0cd4385b 100644
--- a/taskcluster/.build.yml
+++ b/taskcluster/.build.yml
@@ -29,5 +29,4 @@ build:
     package: ''
   args:
     tests_cmdline: ''
-  python_wheel: ''
   deepspeech_pkg_name: ''
diff --git a/taskcluster/darwin-opt-base.tyml b/taskcluster/darwin-opt-base.tyml
index 2e5f2311..caf07f1a 100644
--- a/taskcluster/darwin-opt-base.tyml
+++ b/taskcluster/darwin-opt-base.tyml
@@ -36,7 +36,7 @@ payload:
 
   env:
     $let:
-      training: { $eval: as_slugid("test-training-linux-amd64-py27-opt") }
+      training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
     in:
       TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
       SUMMARIZE_GRAPH_BINARY: ${build.summarize_graph}
diff --git a/taskcluster/linux-amd64-cpu-aot_test-opt.yml b/taskcluster/linux-amd64-cpu-aot_test-opt.yml
index 3265ab20..16c4a61d 100644
--- a/taskcluster/linux-amd64-cpu-aot_test-opt.yml
+++ b/taskcluster/linux-amd64-cpu-aot_test-opt.yml
@@ -5,7 +5,7 @@ build:
     - "pull_request.reopened"
   template_file: linux-opt-base.tyml
   dependencies:
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.master.7d79b8f6422e5b7e0ba82504c500a86756c44a62.cpu/artifacts/public/home.tar.xz"
   summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.master.7d79b8f6422e5b7e0ba82504c500a86756c44a62.cpu/artifacts/public/summarize_graph"
   system_setup:
diff --git a/taskcluster/linux-opt-base.tyml b/taskcluster/linux-opt-base.tyml
index db27238a..e863a990 100644
--- a/taskcluster/linux-opt-base.tyml
+++ b/taskcluster/linux-opt-base.tyml
@@ -33,7 +33,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training-linux-amd64-py27-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
       in:
         TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
         SUMMARIZE_GRAPH_BINARY: ${build.summarize_graph}
diff --git a/taskcluster/test-benchmark-linux-amd64-aot_test-opt.yml b/taskcluster/test-benchmark-linux-amd64-aot_test-opt.yml
index 03ec1385..012d396f 100644
--- a/taskcluster/test-benchmark-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-benchmark-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt} zip
diff --git a/taskcluster/test-benchmark-linux-amd64-opt.yml b/taskcluster/test-benchmark-linux-amd64-opt.yml
index 296f9de6..333532c4 100644
--- a/taskcluster/test-benchmark-linux-amd64-opt.yml
+++ b/taskcluster/test-benchmark-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt} zip
diff --git a/taskcluster/test-cpp-darwin-amd64-opt.yml b/taskcluster/test-cpp-darwin-amd64-opt.yml
index 781ac220..af9bab76 100644
--- a/taskcluster/test-cpp-darwin-amd64-opt.yml
+++ b/taskcluster/test-cpp-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env}
diff --git a/taskcluster/test-cpp-linux-amd64-aot_test-opt.yml b/taskcluster/test-cpp-linux-amd64-aot_test-opt.yml
index 497e1e3a..a83db687 100644
--- a/taskcluster/test-cpp-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-cpp-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests.sh --aot"
   metadata:
diff --git a/taskcluster/test-cpp-linux-amd64-opt.yml b/taskcluster/test-cpp-linux-amd64-opt.yml
index d9728923..520999bd 100644
--- a/taskcluster/test-cpp-linux-amd64-opt.yml
+++ b/taskcluster/test-cpp-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests.sh"
   metadata:
diff --git a/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
index d1b5a023..5695bbe6 100644
--- a/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests-prod.sh"
   metadata:
diff --git a/taskcluster/test-darwin-opt-base.tyml b/taskcluster/test-darwin-opt-base.tyml
index e4711658..bfc51675 100644
--- a/taskcluster/test-darwin-opt-base.tyml
+++ b/taskcluster/test-darwin-opt-base.tyml
@@ -30,11 +30,10 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training-linux-amd64-py27-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
         darwin_amd64_build: { $eval: as_slugid("darwin-amd64-cpu-opt") }
         node_package: { $eval: as_slugid("node-package") }
       in:
-        TENSORFLOW_WHEEL: ${build.python_wheel}
         DEEPSPEECH_ARTIFACTS_ROOT: https://queue.taskcluster.net/v1/task/${darwin_amd64_build}/artifacts/public
         DEEPSPEECH_NODEJS: https://queue.taskcluster.net/v1/task/${node_package}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://queue.taskcluster.net/v1/task/${training}/artifacts/public/output_graph.pb
diff --git a/taskcluster/test-linux-opt-base.tyml b/taskcluster/test-linux-opt-base.tyml
index 005a2455..3ffe7c7a 100644
--- a/taskcluster/test-linux-opt-base.tyml
+++ b/taskcluster/test-linux-opt-base.tyml
@@ -31,13 +31,12 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training-linux-amd64-py27-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
         linux_amd64_aot_test: { $eval: as_slugid("linux-amd64-cpu-aot_test-opt") }
         linux_amd64_build: { $eval: as_slugid("linux-amd64-cpu-opt") }
         linux_amd64_ctc: { $eval: as_slugid("linux-amd64-ctc-opt") }
         node_package: { $eval: as_slugid("node-package") }
       in:
-        TENSORFLOW_WHEEL: ${build.python_wheel}
         DEEPSPEECH_ARTIFACTS_ROOT: https://queue.taskcluster.net/v1/task/${linux_amd64_build}/artifacts/public
         DEEPSPEECH_PYTHON_PACKAGE: https://queue.taskcluster.net/v1/task/${linux_amd64_build}/artifacts/public/${build.deepspeech_pkg_name}
         DEEPSPEECH_NODEJS: https://queue.taskcluster.net/v1/task/${node_package}/artifacts/public
diff --git a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
index 7b09fe17..a93eadd2 100644
--- a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_4} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_4x-linux-amd64-aot_test-opt.yml
index 28486593..d26850ed 100644
--- a/taskcluster/test-nodejs_4x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_4x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml b/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
index a8de16ce..7bcc8ebd 100644
--- a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
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 a20813de..cbd44ab8 100644
--- a/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
index 2cba2cb2..51dedd57 100644
--- a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_5} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_5x-linux-amd64-aot_test-opt.yml
index ba287a29..87b1041e 100644
--- a/taskcluster/test-nodejs_5x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_5x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml b/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
index 58349e8b..d73dff3e 100644
--- a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
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 ec1a8be8..51f73b67 100644
--- a/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
index 732e1a51..0fc8bd9e 100644
--- a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_6} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_6x-linux-amd64-aot_test-opt.yml
index 61e4a048..0392e597 100644
--- a/taskcluster/test-nodejs_6x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_6x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml b/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
index 77c42c6f..dcc39fe3 100644
--- a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
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 691715c0..42f92f7c 100644
--- a/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
index e004659d..2ac6d8b6 100644
--- a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_7} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_7x-linux-amd64-aot_test-opt.yml
index 348326ca..e14a3f35 100644
--- a/taskcluster/test-nodejs_7x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_7x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml b/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
index 91de0905..58e577fa 100644
--- a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
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 05e4af06..b06cc705 100644
--- a/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
index c7c971fa..32917eb2 100644
--- a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_8} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_8x-linux-amd64-aot_test-opt.yml
index 2d93e0b4..9c9c400f 100644
--- a/taskcluster/test-nodejs_8x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_8x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml b/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
index 567cf04b..70a697ad 100644
--- a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
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 6bc57272..cec79f5c 100644
--- a/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
index ff0ee99c..ad4a3112 100644
--- a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_9} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_9x-linux-amd64-aot_test-opt.yml
index 1b29ef88..ad83e475 100644
--- a/taskcluster/test-nodejs_9x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_9x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml b/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
index 42594c81..0ba6d98a 100644
--- a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
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 6b4bd0cc..cdfc64c5 100644
--- a/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-python_27-darwin-amd64-opt.yml b/taskcluster/test-python_27-darwin-amd64-opt.yml
index 9afdb864..e6552acf 100644
--- a/taskcluster/test-python_27-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_27-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 2.7.13"
   metadata:
diff --git a/taskcluster/test-python_27-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_27-linux-amd64-aot_test-opt.yml
index bad59363..f882fddd 100644
--- a/taskcluster/test-python_27-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-python_27-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_27-linux-amd64-opt.yml b/taskcluster/test-python_27-linux-amd64-opt.yml
index 3a9b7c41..2bce3c01 100644
--- a/taskcluster/test-python_27-linux-amd64-opt.yml
+++ b/taskcluster/test-python_27-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_27-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27-linux-amd64-prod_pbmodel-opt.yml
index deb5a6ed..b5f77c80 100644
--- a/taskcluster/test-python_27-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_27-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_34-darwin-amd64-opt.yml b/taskcluster/test-python_34-darwin-amd64-opt.yml
index efbc0225..f767149d 100644
--- a/taskcluster/test-python_34-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_34-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 3.4.6"
   metadata:
diff --git a/taskcluster/test-python_34-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_34-linux-amd64-aot_test-opt.yml
index 96b24845..a72c786c 100644
--- a/taskcluster/test-python_34-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-python_34-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_34-linux-amd64-opt.yml b/taskcluster/test-python_34-linux-amd64-opt.yml
index 1ba8678f..c1cca899 100644
--- a/taskcluster/test-python_34-linux-amd64-opt.yml
+++ b/taskcluster/test-python_34-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_34-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_34-linux-amd64-prod_pbmodel-opt.yml
index 235ad2fd..fda1572b 100644
--- a/taskcluster/test-python_34-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_34-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_35-darwin-amd64-opt.yml b/taskcluster/test-python_35-darwin-amd64-opt.yml
index 28cb5343..108c71ad 100644
--- a/taskcluster/test-python_35-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_35-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 3.5.3"
   metadata:
diff --git a/taskcluster/test-python_35-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_35-linux-amd64-aot_test-opt.yml
index f0544ca6..72cc025d 100644
--- a/taskcluster/test-python_35-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-python_35-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_35-linux-amd64-opt.yml b/taskcluster/test-python_35-linux-amd64-opt.yml
index 53d90e36..23bcea04 100644
--- a/taskcluster/test-python_35-linux-amd64-opt.yml
+++ b/taskcluster/test-python_35-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml
index 070fb922..43346cdf 100644
--- a/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_36-darwin-amd64-opt.yml b/taskcluster/test-python_36-darwin-amd64-opt.yml
index e684b34e..b3c10bf5 100644
--- a/taskcluster/test-python_36-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_36-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 3.6.2"
   metadata:
diff --git a/taskcluster/test-python_36-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_36-linux-amd64-aot_test-opt.yml
index 26cf05be..9b4be188 100644
--- a/taskcluster/test-python_36-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-python_36-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_36-linux-amd64-opt.yml b/taskcluster/test-python_36-linux-amd64-opt.yml
index 199903fa..a893707b 100644
--- a/taskcluster/test-python_36-linux-amd64-opt.yml
+++ b/taskcluster/test-python_36-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
        apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml
index 91b3eb41..87ba007a 100644
--- a/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
        apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-training+deepspeech-linux-amd64-py27-opt.yml b/taskcluster/test-training+deepspeech-linux-amd64-py27-opt.yml-disabled
similarity index 73%
rename from taskcluster/test-training+deepspeech-linux-amd64-py27-opt.yml
rename to taskcluster/test-training+deepspeech-linux-amd64-py27-opt.yml-disabled
index e21a629a..524e64be 100644
--- a/taskcluster/test-training+deepspeech-linux-amd64-py27-opt.yml
+++ b/taskcluster/test-training+deepspeech-linux-amd64-py27-opt.yml-disabled
@@ -8,7 +8,6 @@ build:
       apt-get -qq -y install ${python.packages.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.13 mozilla deepspeech"
-  python_wheel: 'https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.master.7d79b8f6422e5b7e0ba82504c500a86756c44a62.cpu/artifacts/public/tensorflow_warpctc-1.4.0-cp27-cp27mu-linux_x86_64.whl'
   deepspeech_pkg_name: 'deepspeech-0.1.1-cp27-cp27mu-manylinux1_x86_64.whl'
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py2.7 (DS)"
diff --git a/taskcluster/test-training+deepspeech-linux-amd64-py36-opt.yml b/taskcluster/test-training+deepspeech-linux-amd64-py36-opt.yml-disabled
similarity index 73%
rename from taskcluster/test-training+deepspeech-linux-amd64-py36-opt.yml
rename to taskcluster/test-training+deepspeech-linux-amd64-py36-opt.yml-disabled
index 317665c7..478e14c7 100644
--- a/taskcluster/test-training+deepspeech-linux-amd64-py36-opt.yml
+++ b/taskcluster/test-training+deepspeech-linux-amd64-py36-opt.yml-disabled
@@ -8,7 +8,6 @@ build:
       apt-get -qq -y install ${python.packages.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.2 mozilla deepspeech"
-  python_wheel: 'https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.master.7d79b8f6422e5b7e0ba82504c500a86756c44a62.cpu-py36/artifacts/public/tensorflow_warpctc-1.4.0-cp36-cp36m-linux_x86_64.whl'
   deepspeech_pkg_name: 'deepspeech-0.1.1-cp36-cp36m-manylinux1_x86_64.whl'
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py3.6 (DS)"
diff --git a/taskcluster/test-training-linux-amd64-py27-opt.yml b/taskcluster/test-training-linux-amd64-py27-opt.yml-disabled
similarity index 67%
rename from taskcluster/test-training-linux-amd64-py27-opt.yml
rename to taskcluster/test-training-linux-amd64-py27-opt.yml-disabled
index 8f056c4c..dea9c8f1 100644
--- a/taskcluster/test-training-linux-amd64-py27-opt.yml
+++ b/taskcluster/test-training-linux-amd64-py27-opt.yml-disabled
@@ -7,7 +7,6 @@ build:
       apt-get -qq -y install ${python.packages.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.13 mozilla"
-  python_wheel: 'https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.master.7d79b8f6422e5b7e0ba82504c500a86756c44a62.cpu/artifacts/public/tensorflow_warpctc-1.4.0-cp27-cp27mu-linux_x86_64.whl'
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py2.7"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 2.7, CPU only, optimized version"
diff --git a/taskcluster/test-training-linux-amd64-py34-opt.yml b/taskcluster/test-training-linux-amd64-py34-opt.yml-disabled
similarity index 67%
rename from taskcluster/test-training-linux-amd64-py34-opt.yml
rename to taskcluster/test-training-linux-amd64-py34-opt.yml-disabled
index 65735907..d49e654c 100644
--- a/taskcluster/test-training-linux-amd64-py34-opt.yml
+++ b/taskcluster/test-training-linux-amd64-py34-opt.yml-disabled
@@ -7,7 +7,6 @@ build:
       apt-get -qq -y install ${python.packages.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.4.6 mozilla"
-  python_wheel: 'https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.master.7d79b8f6422e5b7e0ba82504c500a86756c44a62.cpu-py34/artifacts/public/tensorflow_warpctc-1.4.0-cp34-cp34m-linux_x86_64.whl'
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py3.4"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 3.4, CPU only, optimized version"
diff --git a/taskcluster/test-training-linux-amd64-py35-opt.yml b/taskcluster/test-training-linux-amd64-py35-opt.yml-disabled
similarity index 67%
rename from taskcluster/test-training-linux-amd64-py35-opt.yml
rename to taskcluster/test-training-linux-amd64-py35-opt.yml-disabled
index eb015923..14d00571 100644
--- a/taskcluster/test-training-linux-amd64-py35-opt.yml
+++ b/taskcluster/test-training-linux-amd64-py35-opt.yml-disabled
@@ -7,7 +7,6 @@ build:
       apt-get -qq -y install ${python.packages.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.5.3 mozilla"
-  python_wheel: 'https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.master.7d79b8f6422e5b7e0ba82504c500a86756c44a62.cpu-py35/artifacts/public/tensorflow_warpctc-1.4.0-cp35-cp35m-linux_x86_64.whl'
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py3.5"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 3.5, CPU only, optimized version"
diff --git a/taskcluster/test-training-linux-amd64-py36-opt.yml b/taskcluster/test-training-linux-amd64-py36-opt.yml-disabled
similarity index 67%
rename from taskcluster/test-training-linux-amd64-py36-opt.yml
rename to taskcluster/test-training-linux-amd64-py36-opt.yml-disabled
index 5ec7f79c..36ea2c42 100644
--- a/taskcluster/test-training-linux-amd64-py36-opt.yml
+++ b/taskcluster/test-training-linux-amd64-py36-opt.yml-disabled
@@ -7,7 +7,6 @@ build:
       apt-get -qq -y install ${python.packages.apt}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.2 mozilla"
-  python_wheel: 'https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.master.7d79b8f6422e5b7e0ba82504c500a86756c44a62.cpu-py36/artifacts/public/tensorflow_warpctc-1.4.0-cp36-cp36m-linux_x86_64.whl'
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py3.6"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 3.6, CPU only, optimized version"