diff --git a/.cron.yml b/.cron.yml
index 52e6e11639..0617632291 100644
--- a/.cron.yml
+++ b/.cron.yml
@@ -10,6 +10,7 @@ jobs:
           type: decision-task
           treeherder-symbol: Nd
           target-tasks-method: nightly_desktop
+          include-push-tasks: true
       run-on-projects:
           - comm-central
       when:
@@ -23,6 +24,7 @@ jobs:
           type: decision-task
           treeherder-symbol: Nd-Ln
           target-tasks-method: nightly_linux
+          include-push-tasks: true
       run-on-projects:
           - comm-central
       when: []  # never (hook only)
@@ -32,6 +34,7 @@ jobs:
           type: decision-task
           treeherder-symbol: Nd-OSX
           target-tasks-method: nightly_macosx
+          include-push-tasks: true
       run-on-projects:
           - comm-central
       when: []  # never (hook only)
@@ -41,6 +44,7 @@ jobs:
           type: decision-task
           treeherder-symbol: Nd-win32
           target-tasks-method: nightly_win32
+          include-push-tasks: true
       run-on-projects:
           - comm-central
       when: []  # never (hook only)
@@ -50,6 +54,7 @@ jobs:
           type: decision-task
           treeherder-symbol: Nd-win64
           target-tasks-method: nightly_win64
+          include-push-tasks: true
       run-on-projects:
           - comm-central
       when: []  # never (hook only)
diff --git a/taskcluster/ci/balrog/kind.yml b/taskcluster/ci/balrog/kind.yml
index 03e70bb7bc..86c857e936 100644
--- a/taskcluster/ci/balrog/kind.yml
+++ b/taskcluster/ci/balrog/kind.yml
@@ -16,4 +16,4 @@ kind-dependencies:
 
 only-for-attributes:
     - nightly
-    - signed
+    - shippable
diff --git a/taskcluster/ci/beetmover-checksums/kind.yml b/taskcluster/ci/beetmover-checksums/kind.yml
index f984588f97..7245546861 100644
--- a/taskcluster/ci/beetmover-checksums/kind.yml
+++ b/taskcluster/ci/beetmover-checksums/kind.yml
@@ -14,6 +14,7 @@ kind-dependencies:
 
 only-for-attributes:
     - nightly
+    - shippable
 
 job-template:
     shipping-phase: promote
diff --git a/taskcluster/ci/beetmover-l10n/kind.yml b/taskcluster/ci/beetmover-l10n/kind.yml
index a2eadc039a..b41572bb3e 100644
--- a/taskcluster/ci/beetmover-l10n/kind.yml
+++ b/taskcluster/ci/beetmover-l10n/kind.yml
@@ -18,8 +18,8 @@ only-for-attributes:
     - nightly
 
 not-for-build-platforms:
-    - linux-nightly/opt
-    - linux64-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - linux-shippable/opt
+    - linux64-shippable/opt
+    - macosx64-shippable/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
diff --git a/taskcluster/ci/beetmover-repackage/kind.yml b/taskcluster/ci/beetmover-repackage/kind.yml
index 9518acfe34..0c72956b5e 100644
--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -32,11 +32,11 @@ primary-dependency:
     - repackage-l10n
 
 only-for-build-platforms:
-    - linux-nightly/opt
-    - linux64-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - linux-shippable/opt
+    - linux64-shippable/opt
+    - macosx64-shippable/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
 
 job-template:
     shipping-phase: promote
diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml
index 5122f17af4..84057f2221 100644
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -30,20 +30,20 @@ linux64/opt:
         - linux64-rust
         - linux64-sccache
 
-linux64-nightly/opt:
-    description: "Linux64 Nightly"
+linux64-shippable/opt:
+    description: "Linux64 Shippable"
     attributes:
-        nightly: true
+        shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
     index:
         product: thunderbird
         job-name: linux64-opt
-        type: nightly
+        type: shippable
     treeherder:
-        platform: linux64/opt
-        symbol: N
+        platform: linux64-shippable/opt
+        symbol: B
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian7-amd64-build"}
@@ -134,20 +134,20 @@ linux/opt:
         - linux64-rust
         - linux64-sccache
 
-linux-nightly/opt:
-    description: "Linux32 Nightly"
+linux-shippable/opt:
+    description: "Linux32 Shippable"
     attributes:
-        nightly: true
+        shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
     index:
         product: thunderbird
         job-name: linux32-opt
-        type: nightly
+        type: shippable
     treeherder:
-        platform: linux32/opt
-        symbol: N
+        platform: linux32-shippable/opt
+        symbol: B
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian7-i386-build"}
diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml
index 4b4e2e20ce..1686c20860 100644
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -78,20 +78,20 @@ macosx64/opt:
         - linux64-rust-macos
         - linux64-sccache
 
-macosx64-nightly/opt:
-    description: "MacOS X x64 Cross-compile Nightly"
+macosx64-shippable/opt:
+    description: "MacOS X x64 Cross-compile"
     attributes:
-        nightly: true
+        shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
     index:
         product: thunderbird
         job-name: macosx64-opt
-        type: nightly
+        type: shippable
     treeherder:
-        platform: osx-cross/opt
-        symbol: N
+        platform: osx-shippable/opt
+        symbol: B
         tier: 1
     worker-type: b-linux
     worker:
diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml
index 28b119385f..297724b52a 100644
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -38,24 +38,24 @@ win32/opt:
         - win64-rust
         - win64-sccache
 
-win32-nightly/opt:
-    description: "Win32 Nightly"
-    attributes:
-        nightly: true
-        enable-full-crashsymbols: true
-    shipping-phase: build
-    shipping-product: thunderbird
+win32-shippable/opt:
+    description: "Win32 Opt Shippable"
     index:
         product: thunderbird
         job-name: win32-opt
-        type: nightly
+        type: shippable
+    attributes:
+        shippable: true
+        enable-full-crashsymbols: true
+    shipping-phase: build
+    shipping-product: thunderbird
     treeherder:
-        platform: windows2012-32/opt
-        symbol: N
+        platform: windows2012-32-shippable/opt
+        symbol: B
         tier: 1
     worker-type: b-win2012
     worker:
-        max-run-time: 7200
+        max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "comm/mail/config/tooltool-manifests/win32/releng.manifest"
     run:
@@ -140,24 +140,24 @@ win64/opt:
         - win64-rust
         - win64-sccache
 
-win64-nightly/opt:
-    description: "Win64 Nightly"
-    attributes:
-        nightly: true
-        enable-full-crashsymbols: true
-    shipping-phase: build
-    shipping-product: thunderbird
+win64-shippable/opt:
+    description: "Win64 Opt Shippable"
     index:
         product: thunderbird
         job-name: win64-opt
-        type: nightly
+        type: shippable
+    attributes:
+        shippable: true
+        enable-full-crashsymbols: true
+    shipping-phase: build
+    shipping-product: thunderbird
     treeherder:
-        platform: windows2012-64/opt
-        symbol: N
+        platform: windows2012-64-shippable/opt
+        symbol: B
         tier: 1
     worker-type: b-win2012
     worker:
-        max-run-time: 7200
+        max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "comm/mail/config/tooltool-manifests/win64/releng.manifest"
     run:
diff --git a/taskcluster/ci/checksums-signing/kind.yml b/taskcluster/ci/checksums-signing/kind.yml
index cfa58e2224..6cbcde5cc3 100644
--- a/taskcluster/ci/checksums-signing/kind.yml
+++ b/taskcluster/ci/checksums-signing/kind.yml
@@ -15,3 +15,4 @@ kind-dependencies:
 
 only-for-attributes:
     - nightly
+    - shippable
diff --git a/taskcluster/ci/mar-signing-l10n/kind.yml b/taskcluster/ci/mar-signing-l10n/kind.yml
index 676be612a5..31bd9de179 100644
--- a/taskcluster/ci/mar-signing-l10n/kind.yml
+++ b/taskcluster/ci/mar-signing-l10n/kind.yml
@@ -13,11 +13,11 @@ kind-dependencies:
     - repackage-l10n
 
 only-for-build-platforms:
-    - linux-nightly/opt
-    - linux64-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - linux-shippable/opt
+    - linux64-shippable/opt
+    - macosx64-shippable/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
 
 job-template:
     shipping-phase: promote
diff --git a/taskcluster/ci/mar-signing/kind.yml b/taskcluster/ci/mar-signing/kind.yml
index 208a55e09a..ef9cac3154 100644
--- a/taskcluster/ci/mar-signing/kind.yml
+++ b/taskcluster/ci/mar-signing/kind.yml
@@ -13,11 +13,11 @@ kind-dependencies:
     - repackage
 
 only-for-build-platforms:
-    - linux-nightly/opt
-    - linux64-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - linux-shippable/opt
+    - linux64-shippable/opt
+    - macosx64-shippable/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
 
 job-template:
     shipping-phase: promote
diff --git a/taskcluster/ci/nightly-l10n-signing/kind.yml b/taskcluster/ci/nightly-l10n-signing/kind.yml
index f1453da21e..e5ca76c4bf 100644
--- a/taskcluster/ci/nightly-l10n-signing/kind.yml
+++ b/taskcluster/ci/nightly-l10n-signing/kind.yml
@@ -16,3 +16,4 @@ kind-dependencies:
 
 only-for-attributes:
     - nightly
+    - shippable
diff --git a/taskcluster/ci/nightly-l10n/kind.yml b/taskcluster/ci/nightly-l10n/kind.yml
index 6f406ae838..dfd370e45f 100644
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -21,11 +21,11 @@ kind-dependencies:
 primary-dependency: build
 
 only-for-build-platforms:
-    - linux64-nightly/opt
-    - linux-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - linux64-shippable/opt
+    - linux-shippable/opt
+    - macosx64-shippable/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
 
 job-template:
     description: Localization
@@ -50,10 +50,18 @@ job-template:
                 - linux64-hfsplus
     tooltool:
         by-build-platform:
-            default: public
-            macosx64-nightly: internal
-            win32-nightly: internal
-            win64-nightly: internal
+            default: internal
+            linux.*: public
+    index:
+        type: shippable-l10n
+        product: thunderbird
+        job-name:
+            by-build-platform:
+                linux-shippable: linux-opt
+                linux64-shippable: linux64-opt
+                macosx64-shippable: macosx64-opt
+                win32-shippable: win32-opt
+                win64-shippable: win64-opt
     worker-type:
         by-build-platform:
             default: b-linux
@@ -63,18 +71,18 @@ job-template:
         tier: 1
         platform:
             by-build-platform:
-                linux64-nightly: linux64/opt
-                linux-nightly: linux32/opt
-                macosx64-nightly: osx-cross/opt
-                win32-nightly: windows2012-32/opt
-                win64-nightly: windows2012-64/opt
+                linux64-shippable: linux64-shippable/opt
+                linux-shippable: linux32-shippable/opt
+                macosx64-shippable: osx-shippable/opt
+                win32-shippable: windows2012-32-shippable/opt
+                win64-shippable: windows2012-64-shippable/opt
     env:
         by-build-platform:
             linux.*:   # linux64 and 32 get same treatment here
                 EN_US_PACKAGE_NAME: target.tar.bz2
                 EN_US_BINARY_URL:
                     artifact-reference: <build-signing/{artifact_prefix}>
-            macosx64-nightly:
+            macosx64.*:
                 EN_US_PACKAGE_NAME: target.dmg
                 EN_US_BINARY_URL:
                     artifact-reference: <repackage/{artifact_prefix}>
@@ -89,31 +97,31 @@ job-template:
         config:
             # no default, so we fail on new entries
             by-build-platform:
-                linux-nightly:
+                linux-shippable:
                     - single_locale/linux32.py
                     - single_locale/tc_common.py
                     - single_locale/tc_linux_common.py
                     - single_locale/thunderbird.py
                     - taskcluster_nightly.py
-                linux64-nightly:
+                linux64-shippable:
                     - single_locale/linux64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_linux_common.py
                     - single_locale/thunderbird.py
                     - taskcluster_nightly.py
-                macosx64-nightly:
+                macosx64-shippable:
                     - single_locale/macosx64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_macosx64.py
                     - single_locale/thunderbird.py
                     - taskcluster_nightly.py
-                win32-nightly:
+                win32-shippable:
                     - single_locale/win32.py
                     - single_locale/tc_common.py
                     - single_locale/tc_win32.py
                     - single_locale/thunderbird.py
                     - taskcluster_nightly.py
-                win64-nightly:
+                win64-shippable:
                     - single_locale/win64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_win64.py
diff --git a/taskcluster/ci/release-update-verify-config/kind.yml b/taskcluster/ci/release-update-verify-config/kind.yml
index 692af8b602..f3497ed3d3 100644
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -70,7 +70,7 @@ jobs:
             kind: test
             tier: 1
         attributes:
-            build_platform: linux-nightly
+            build_platform: linux-shippable
         extra:
             product: thunderbird
             platform: linux-i686
@@ -93,7 +93,7 @@ jobs:
             kind: test
             tier: 1
         attributes:
-            build_platform: linux64-nightly
+            build_platform: linux64-shippable
         extra:
             product: thunderbird
             platform: linux-x86_64
@@ -116,7 +116,7 @@ jobs:
             kind: test
             tier: 1
         attributes:
-            build_platform: macosx64-nightly
+            build_platform: macosx64-shippable
         extra:
             product: thunderbird
             platform: mac
@@ -139,7 +139,7 @@ jobs:
             kind: test
             tier: 1
         attributes:
-            build_platform: win32-nightly
+            build_platform: win32-shippable
         extra:
             product: thunderbird
             platform: win32
@@ -162,7 +162,7 @@ jobs:
             kind: test
             tier: 1
         attributes:
-            build_platform: win64-nightly
+            build_platform: win64-shippable
         extra:
             product: thunderbird
             platform: win64
diff --git a/taskcluster/ci/release-update-verify/kind.yml b/taskcluster/ci/release-update-verify/kind.yml
index eaafb3281e..00c045b0dc 100644
--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -51,7 +51,7 @@ jobs:
             kind: test
             tier: 1
         attributes:
-            build_platform: linux64-nightly
+            build_platform: linux64-shippable
 
     thunderbird-linux:
         description: linux update verify
@@ -62,7 +62,7 @@ jobs:
             kind: test
             tier: 1
         attributes:
-            build_platform: linux-nightly
+            build_platform: linux-shippable
 
     thunderbird-win64:
         description: win64 update verify
@@ -73,7 +73,7 @@ jobs:
             kind: test
             tier: 1
         attributes:
-            build_platform: win64-nightly
+            build_platform: win64-shippable
 
     thunderbird-win32:
         description: win32 update verify
@@ -84,7 +84,7 @@ jobs:
             kind: test
             tier: 1
         attributes:
-            build_platform: win32-nightly
+            build_platform: win32-shippable
 
     thunderbird-macosx64:
         description: macosx64 update verify
@@ -95,4 +95,4 @@ jobs:
             kind: test
             tier: 1
         attributes:
-            build_platform: macosx64-nightly
+            build_platform: macosx64-shippable
diff --git a/taskcluster/ci/repackage-l10n/kind.yml b/taskcluster/ci/repackage-l10n/kind.yml
index 59d51fbf6b..42b2aeb314 100644
--- a/taskcluster/ci/repackage-l10n/kind.yml
+++ b/taskcluster/ci/repackage-l10n/kind.yml
@@ -18,11 +18,11 @@ kind-dependencies:
     - toolchain
 
 only-for-build-platforms:
-    - linux-nightly/opt
-    - linux64-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - linux-shippable/opt
+    - linux64-shippable/opt
+    - macosx64-shippable/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
 
 job-template:
     mozharness:
diff --git a/taskcluster/ci/repackage-msi/kind.yml b/taskcluster/ci/repackage-msi/kind.yml
index fb53aac479..7ab13f907b 100644
--- a/taskcluster/ci/repackage-msi/kind.yml
+++ b/taskcluster/ci/repackage-msi/kind.yml
@@ -17,8 +17,8 @@ kind-dependencies:
     - fetch
 
 only-for-build-platforms:
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
 
 job-template:
     mozharness:
diff --git a/taskcluster/ci/repackage-signing-l10n/kind.yml b/taskcluster/ci/repackage-signing-l10n/kind.yml
index 723d765ad1..47e485db27 100644
--- a/taskcluster/ci/repackage-signing-l10n/kind.yml
+++ b/taskcluster/ci/repackage-signing-l10n/kind.yml
@@ -15,5 +15,5 @@ kind-dependencies:
     - repackage-l10n
 
 only-for-build-platforms:
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
diff --git a/taskcluster/ci/repackage-signing-msi/kind.yml b/taskcluster/ci/repackage-signing-msi/kind.yml
index 1237af56bd..dc0d872d15 100644
--- a/taskcluster/ci/repackage-signing-msi/kind.yml
+++ b/taskcluster/ci/repackage-signing-msi/kind.yml
@@ -13,7 +13,7 @@ kind-dependencies:
     - repackage-msi
 
 only-for-build-platforms:
-    - win32-nightly/opt
+    - win32-shippable/opt
     - win32/opt
-    - win64-nightly/opt
+    - win64-shippable/opt
     - win64/opt
diff --git a/taskcluster/ci/repackage-signing/kind.yml b/taskcluster/ci/repackage-signing/kind.yml
index e835d92bfb..0ecff6cb35 100644
--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing/kind.yml
@@ -15,5 +15,5 @@ kind-dependencies:
     - repackage
 
 only-for-build-platforms:
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
diff --git a/taskcluster/ci/repackage/kind.yml b/taskcluster/ci/repackage/kind.yml
index 09bfba1abd..16ddb9ef3b 100644
--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -17,11 +17,11 @@ kind-dependencies:
     - toolchain
 
 only-for-build-platforms:
-    - linux-nightly/opt
-    - linux64-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - linux-shippable/opt
+    - linux64-shippable/opt
+    - macosx64-shippable/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
 
 job-template:
     mozharness:
diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index bc1205baaf..a623854ec9 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -20,8 +20,8 @@ linux64/opt:
         - common-tests
         - optimized-tests
 
-linux64-nightly/opt:
-    build-platform: linux64-nightly/opt
+linux64-shippable/opt:
+    build-platform: linux64-shippable/opt
     test-sets:
         - common-tests
         - optimized-tests
@@ -31,14 +31,8 @@ linux64/debug:
     test-sets:
         - common-tests
 
-linux32/opt:
-    build-platform: linux/opt
-    test-sets:
-        - common-tests
-        - optimized-tests
-
-linux32-nightly/opt:
-    build-platform: linux-nightly/opt
+linux32-shippable/opt:
+    build-platform: linux-shippable/opt
     test-sets:
         - common-tests
         - optimized-tests
@@ -57,8 +51,8 @@ windows7-32/opt:
         - common-tests
         - optimized-tests
 
-windows7-32-nightly/opt:
-    build-platform: win32-nightly/opt
+windows7-32-shippable/opt:
+    build-platform: win32-shippable/opt
     test-sets:
         - common-tests
         - optimized-tests
@@ -75,8 +69,8 @@ windows10-64/opt:
         - common-tests
         - optimized-tests
 
-windows10-64-nightly/opt:
-    build-platform: win64-nightly/opt
+windows10-64-shippable/opt:
+    build-platform: win64-shippable/opt
     test-sets:
         - common-tests
         - optimized-tests
@@ -93,14 +87,8 @@ macosx64/debug:
     test-sets:
         - common-tests
 
-macosx64/opt:
-    build-platform: macosx64/opt
-    test-sets:
-        - common-tests
-        - optimized-tests
-
-macosx64-nightly/opt:
-    build-platform: macosx64-nightly/opt
+macosx64-shippable/opt:
+    build-platform: macosx64-shippable/opt
     test-sets:
         - common-tests
         - optimized-tests
diff --git a/taskcluster/ci/upload-symbols/kind.yml b/taskcluster/ci/upload-symbols/kind.yml
index 23dfe588d2..0a9e433551 100644
--- a/taskcluster/ci/upload-symbols/kind.yml
+++ b/taskcluster/ci/upload-symbols/kind.yml
@@ -13,11 +13,11 @@ kind-dependencies:
     - build
 
 only-for-build-platforms:
-    - linux64-nightly/opt
-    - linux-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - linux64-shippable/opt
+    - linux-shippable/opt
+    - macosx64-shippable/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
 
 job-template:
     description: Upload Symbols