diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml
index 8b59ddeca9..bad1ea7c48 100644
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -7,7 +7,6 @@ loader: taskgraph.loader.transform:loader
 kind-dependencies:
     - fetch
     - toolchain
-    - thirdparty
 
 transforms:
     - taskgraph.transforms.build:transforms
diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml
index 06594fb06a..69000046b0 100644
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -7,8 +7,6 @@ linux64/opt:
     index:
         product: thunderbird
         job-name: linux64-opt
-    dependencies:
-        thirdparty-libotr-linux64: thirdparty-libotr-linux64
     treeherder:
         platform: linux64/opt
         symbol: B
@@ -34,13 +32,12 @@ linux64/opt:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang
+            - linux64-libotr
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
-        thirdparty-libotr-linux64:
-            - libotr.tar.xz
 
 linux64-shippable/opt:
     description: "Linux64 Shippable"
@@ -54,8 +51,6 @@ linux64-shippable/opt:
         product: thunderbird
         job-name: linux64-opt
         type: shippable
-    dependencies:
-        thirdparty-libotr-linux64: thirdparty-libotr-linux64
     treeherder:
         platform: linux64-shippable/opt
         symbol: B
@@ -82,20 +77,17 @@ linux64-shippable/opt:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang
+            - linux64-libotr
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
-        thirdparty-libotr-linux64:
-            - libotr.tar.xz
 
 linux64/debug:
     description: "Linux64 Debug"
     index:
         product: thunderbird
         job-name: linux64-debug
-    dependencies:
-        thirdparty-libotr-linux64: thirdparty-libotr-linux64
     treeherder:
         platform: linux64/debug
         symbol: B
@@ -124,21 +116,18 @@ linux64/debug:
             - linux64-cbindgen
             - linux64-clang
             - linux64-fix-stacks  # see bug 1614626
+            - linux64-libotr
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
-        thirdparty-libotr-linux64:
-            - libotr.tar.xz
 
 linux/opt:
     description: "Linux32 Opt"
     index:
         product: thunderbird
         job-name: linux32-opt
-    dependencies:
-        thirdparty-libotr-linux32: thirdparty-libotr-linux32
     treeherder:
         platform: linux32/opt
         symbol: B
@@ -162,13 +151,12 @@ linux/opt:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang
+            - linux32-libotr
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
-        thirdparty-libotr-linux32:
-            - libotr.tar.xz
 
 linux-shippable/opt:
     description: "Linux32 Shippable"
@@ -182,8 +170,6 @@ linux-shippable/opt:
         product: thunderbird
         job-name: linux32-opt
         type: shippable
-    dependencies:
-        thirdparty-libotr-linux32: thirdparty-libotr-linux32
     treeherder:
         platform: linux32-shippable/opt
         symbol: B
@@ -210,20 +196,17 @@ linux-shippable/opt:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang
+            - linux32-libotr
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
-        thirdparty-libotr-linux32:
-            - libotr.tar.xz
 
 linux/debug:
     description: "Linux32 Debug"
     index:
         product: thunderbird
         job-name: linux32-debug
-    dependencies:
-        thirdparty-libotr-linux32: thirdparty-libotr-linux32
     treeherder:
         platform: linux32/debug
         symbol: B
@@ -250,10 +233,9 @@ linux/debug:
             - linux64-cbindgen
             - linux64-clang
             - linux64-fix-stacks  # see bug 1614626
+            - linux32-libotr
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
-        thirdparty-libotr-linux32:
-            - libotr.tar.xz
diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml
index 752bce323c..90ef18a298 100644
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -7,8 +7,6 @@ macosx64/debug:
     index:
         product: thunderbird
         job-name: macosx64-debug
-    dependencies:
-        thirdparty-libotr-macosx64: thirdparty-libotr-macosx64
     treeherder:
         platform: osx-cross/debug
         symbol: B
@@ -47,16 +45,13 @@ macosx64/debug:
             - linux64-rust-macos
             - linux64-rust-size
             - linux64-sccache
-        thirdparty-libotr-macosx64:
-            - libotr.tar.xz
+            - macosx64-libotr
 
 macosx64/opt:
     description: "MacOS X x64 Cross-compile"
     index:
         product: thunderbird
         job-name: macosx64-opt
-    dependencies:
-        thirdparty-libotr-macosx64: thirdparty-libotr-macosx64
     treeherder:
         platform: osx-cross/opt
         symbol: B
@@ -93,8 +88,7 @@ macosx64/opt:
             - linux64-rust-macos
             - linux64-rust-size
             - linux64-sccache
-        thirdparty-libotr-macosx64:
-            - libotr.tar.xz
+            - macosx64-libotr
 
 macosx64-shippable/opt:
     description: "MacOS X x64 Cross-compile"
@@ -108,8 +102,6 @@ macosx64-shippable/opt:
         product: thunderbird
         job-name: macosx64-opt
         type: shippable
-    dependencies:
-        thirdparty-libotr-macosx64: thirdparty-libotr-macosx64
     treeherder:
         platform: osx-shippable/opt
         symbol: B
@@ -146,5 +138,4 @@ macosx64-shippable/opt:
             - linux64-node
             - linux64-rust-macos
             - linux64-rust-size
-        thirdparty-libotr-macosx64:
-            - libotr.tar.xz
+            - macosx64-libotr
diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml
index 784a027567..d87ffd11d4 100644
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -19,8 +19,6 @@ win32/opt:
     index:
         product: thunderbird
         job-name: win32-opt
-    dependencies:
-        thirdparty-libotr-win32: thirdparty-libotr-win32
     attributes:
         enable-build-signing: true
         enable-full-crashsymbols: true
@@ -63,11 +61,10 @@ win32/opt:
             - linux64-sccache
             - linux64-winchecksec
             - linux64-wine
+            - win32-libotr
         fetch:
             - nsis-3.01-win
             - upx-3.95-win
-        thirdparty-libotr-win32:
-            - libotr.tar.xz
 
 win32-shippable/opt:
     description: "Win32 Opt Shippable"
@@ -75,8 +72,6 @@ win32-shippable/opt:
         product: thunderbird
         job-name: win32-opt
         type: shippable
-    dependencies:
-        thirdparty-libotr-win32: thirdparty-libotr-win32
     attributes:
         shippable: true
         nightly: true
@@ -123,19 +118,16 @@ win32-shippable/opt:
             - linux64-rust-size
             - linux64-winchecksec
             - linux64-wine
+            - win32-libotr
         fetch:
             - nsis-3.01-win
             - upx-3.95-win
-        thirdparty-libotr-win32:
-            - libotr.tar.xz
 
 win32/debug:
     description: "Win32 Debug (Cross)"
     index:
         product: thunderbird
         job-name: win32-debug
-    dependencies:
-        thirdparty-libotr-win32: thirdparty-libotr-win32
     attributes:
         enable-build-signing: true
         enable-full-crashsymbols: true
@@ -179,19 +171,16 @@ win32/debug:
             - linux64-sccache
             - linux64-winchecksec
             - linux64-wine
+            - win32-libotr
         fetch:
             - nsis-3.01-win
             - upx-3.95-win
-        thirdparty-libotr-win32:
-            - libotr.tar.xz
 
 win64/opt:
     description: "Win64 Opt (Cross)"
     index:
         product: thunderbird
         job-name: win64-opt
-    dependencies:
-        thirdparty-libotr-win64: thirdparty-libotr-win64
     attributes:
         enable-build-signing: true
         enable-full-crashsymbols: true
@@ -234,11 +223,10 @@ win64/opt:
             - linux64-sccache
             - linux64-winchecksec
             - linux64-wine
+            - win64-libotr
         fetch:
             - nsis-3.01-win
             - upx-3.95-win
-        thirdparty-libotr-win64:
-            - libotr.tar.xz
 
 win64-shippable/opt:
     description: "Win64 Opt Shippable"
@@ -246,8 +234,6 @@ win64-shippable/opt:
         product: thunderbird
         job-name: win64-opt
         type: shippable
-    dependencies:
-        thirdparty-libotr-win64: thirdparty-libotr-win64
     attributes:
         shippable: true
         nightly: true
@@ -294,19 +280,16 @@ win64-shippable/opt:
             - linux64-rust-size
             - linux64-winchecksec
             - linux64-wine
+            - win64-libotr
         fetch:
             - nsis-3.01-win
             - upx-3.95-win
-        thirdparty-libotr-win64:
-            - libotr.tar.xz
 
 win64/debug:
     description: "Win64 Debug (Cross)"
     index:
         product: thunderbird
         job-name: win64-debug
-    dependencies:
-        thirdparty-libotr-win64: thirdparty-libotr-win64
     attributes:
         enable-build-signing: true
         enable-full-crashsymbols: true
@@ -350,11 +333,10 @@ win64/debug:
             - linux64-sccache
             - linux64-winchecksec
             - linux64-wine
+            - win64-libotr
         fetch:
             - nsis-3.01-win
             - upx-3.95-win
-        thirdparty-libotr-win64:
-            - libotr.tar.xz
 
 
 win64-plain/debug:
@@ -362,8 +344,6 @@ win64-plain/debug:
     index:
         product: thunderbird
         job-name: win64-plain-debug
-    dependencies:
-        thirdparty-libotr-win64: thirdparty-libotr-win64
     treeherder:
         platform: windows2012-64/debug
         symbol: Bp
@@ -391,20 +371,17 @@ win64-plain/debug:
         toolchain:
             - win64-cbindgen
             - win64-clang-cl
+            - win64-libotr
             - win64-node
             - win64-nasm
             - win64-rust
             - win64-winchecksec
-        thirdparty-libotr-win64:
-            - libotr.tar.xz
 
 win64-plain/opt:
     description: "Win64 Opt Plain"
     index:
         product: thunderbird
         job-name: win64-plain-opt
-    dependencies:
-        thirdparty-libotr-win64: thirdparty-libotr-win64
     treeherder:
         platform: windows2012-64/opt
         symbol: Bp
@@ -432,9 +409,8 @@ win64-plain/opt:
         toolchain:
             - win64-cbindgen
             - win64-clang-cl
+            - win64-libotr
             - win64-node
             - win64-nasm
             - win64-rust
             - win64-winchecksec
-        thirdparty-libotr-win64:
-            - libotr.tar.xz