--- a/taskcluster/ci/balrog/kind.yml
+++ b/taskcluster/ci/balrog/kind.yml
@@ -11,9 +11,9 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - beetmover-l10n
     - beetmover-repackage
 
 only-for-attributes:
     - nightly
-    - signed
+    - shippable

--- a/taskcluster/ci/beetmover-checksums/kind.yml
+++ b/taskcluster/ci/beetmover-checksums/kind.yml
@@ -9,13 +9,14 @@ transforms:
     - taskgraph.transforms.beetmover_checksums:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - checksums-signing
 
 only-for-attributes:
     - nightly
+    - shippable
 
 job-template:
     shipping-phase: promote
     attributes:
         artifact_prefix: public

--- a/taskcluster/ci/beetmover-l10n/kind.yml
+++ b/taskcluster/ci/beetmover-l10n/kind.yml
@@ -13,13 +13,13 @@ transforms:
 
 kind-dependencies:
     - nightly-l10n-signing
 
 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

--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -27,16 +27,16 @@ kind-dependencies:
     - mar-signing
     - mar-signing-l10n
 
 primary-dependency:
     - repackage
     - 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

--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -25,30 +25,30 @@ linux64/opt:
         - linux64-binutils
         - linux64-cbindgen
         - linux64-clang
         - linux64-nasm
         - linux64-node
         - 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: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         docker-image: {in-tree: "debian7-amd64-build"}
         max-run-time: 36000
     run:
         using: mozharness
         comm-checkout: true
         actions: [build, check-test]
@@ -129,30 +129,30 @@ linux/opt:
         - linux64-binutils
         - linux64-cbindgen
         - linux64-clang
         - linux64-nasm
         - linux64-node
         - 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: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         docker-image: {in-tree: "debian7-i386-build"}
         max-run-time: 36000
     run:
         using: mozharness
         comm-checkout: true
         actions: [build, check-test]

--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -73,48 +73,49 @@ macosx64/opt:
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-nasm
         - linux64-node
         - 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: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
-        max-run-time: 36000
+        max-run-time: 7200
         env:
             # We just use the browser manifest, since we don't need anything different
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
         comm-checkout: true
-        actions: [build]
+        actions: [get-secrets, build]
         config-paths:
             - comm/mozharness
         config:
-            - builds/taskcluster_base_thunderbird.py
+            - builds/releng_base_firefox.py
             - builds/releng_base_mac_64_cross_builds.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
         tooltool-downloads: internal
     toolchains:
         - linux64-binutils
         - linux64-cbindgen
         - linux64-cctools-port
         - linux64-clang
         - linux64-hfsplus
         - linux64-libdmg

--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -33,34 +33,34 @@ win32/opt:
     toolchains:
         - win64-cbindgen
         - win64-clang-cl
         - win64-nasm
         - win64-node
         - win64-rust
         - win64-sccache
 
-win32-nightly/opt:
-    description: "Win32 Nightly"
+win32-shippable/opt:
+    description: "Win32 Opt Shippable"
+    index:
+        product: thunderbird
+        job-name: win32-opt
+        type: shippable
     attributes:
-        nightly: true
+        shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
-    index:
-        product: thunderbird
-        job-name: win32-opt
-        type: nightly
     treeherder:
-        platform: windows2012-32/opt
-        symbol: N
+        platform: windows2012-32-shippable/opt
+        symbol: B
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
-        max-run-time: 7200
+        max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "comm/mail/config/tooltool-manifests/win32/releng.manifest"
     run:
         actions: [build, check-test]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
@@ -135,34 +135,34 @@ win64/opt:
     toolchains:
         - win64-cbindgen
         - win64-clang-cl
         - win64-nasm
         - win64-node
         - win64-rust
         - win64-sccache
 
-win64-nightly/opt:
-    description: "Win64 Nightly"
+win64-shippable/opt:
+    description: "Win64 Opt Shippable"
+    index:
+        product: thunderbird
+        job-name: win64-opt
+        type: shippable
     attributes:
-        nightly: true
+        shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
-    index:
-        product: thunderbird
-        job-name: win64-opt
-        type: nightly
     treeherder:
-        platform: windows2012-64/opt
-        symbol: N
+        platform: windows2012-64-shippable/opt
+        symbol: B
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
-        max-run-time: 7200
+        max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "comm/mail/config/tooltool-manifests/win64/releng.manifest"
     run:
         actions: [build, check-test]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py

--- a/taskcluster/ci/checksums-signing/kind.yml
+++ b/taskcluster/ci/checksums-signing/kind.yml
@@ -10,8 +10,9 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - beetmover-l10n
     - beetmover-repackage
 
 only-for-attributes:
     - nightly
+    - shippable

--- a/taskcluster/ci/mar-signing-l10n/kind.yml
+++ b/taskcluster/ci/mar-signing-l10n/kind.yml
@@ -8,20 +8,20 @@ transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.mar_signing:transforms
     - taskgraph.transforms.task:transforms
 
 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
     treeherder-group: ms
     description-suffix: 'mar signing'
     required_signoffs:
         - mar-signing

--- a/taskcluster/ci/mar-signing/kind.yml
+++ b/taskcluster/ci/mar-signing/kind.yml
@@ -8,20 +8,20 @@ transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.mar_signing:transforms
     - taskgraph.transforms.task:transforms
 
 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
     treeherder-group: ms
     description-suffix: 'mar signing'
     required_signoffs:
         - mar-signing

--- a/taskcluster/ci/nightly-l10n-signing/kind.yml
+++ b/taskcluster/ci/nightly-l10n-signing/kind.yml
@@ -11,8 +11,9 @@ transforms:
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 kind-dependencies:
     - nightly-l10n
 
 only-for-attributes:
     - nightly
+    - shippable

--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -16,21 +16,21 @@ kind-dependencies:
     - build
     - build-signing
     - repackage
     - toolchain
 
 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
     locales-file: comm/mail/locales/l10n-changesets.json
     locales-per-chunk: 5
     run-on-projects: ['release']
     attributes:
         shipping_phase: promote
@@ -45,80 +45,88 @@ job-template:
     toolchains:
         by-build-platform:
             default: []
             macosx64.*:
                 - linux64-libdmg
                 - 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: aws-provisioner-v1/gecko-{level}-b-linux
             win.*: aws-provisioner-v1/gecko-{level}-b-win2012
     treeherder:
         symbol: L10n(N)
         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}>
             win.*:
                 EN_US_PACKAGE_NAME: target.zip
                 EN_US_BINARY_URL:
                     artifact-reference: <build-signing/{artifact_prefix}>
     mozharness:
         comm-checkout: true
         config-paths:
             - comm/mozharness
         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
                     - single_locale/thunderbird.py
                     - taskcluster_nightly.py
         actions: ['clone-locales', 'list-locales', 'setup', 'repack',
                   'summary']
         script: mozharness/scripts/desktop_l10n.py

--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -65,17 +65,17 @@ jobs:
     thunderbird-linux:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: linux32/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: linux-nightly
+            build_platform: linux-shippable
         extra:
             product: thunderbird
             platform: linux-i686
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
@@ -88,17 +88,17 @@ jobs:
     thunderbird-linux64:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: linux64/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: linux64-nightly
+            build_platform: linux64-shippable
         extra:
             product: thunderbird
             platform: linux-x86_64
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
@@ -111,17 +111,17 @@ jobs:
     thunderbird-macosx64:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: osx-cross/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: macosx64-nightly
+            build_platform: macosx64-shippable
         extra:
             product: thunderbird
             platform: mac
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
@@ -134,17 +134,17 @@ jobs:
     thunderbird-win32:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: windows2012-32/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: win32-nightly
+            build_platform: win32-shippable
         extra:
             product: thunderbird
             platform: win32
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
@@ -157,17 +157,17 @@ jobs:
     thunderbird-win64:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: windows2012-64/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: win64-nightly
+            build_platform: win64-shippable
         extra:
             product: thunderbird
             platform: win64
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"

--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -46,53 +46,53 @@ jobs:
         description: linux64 update verify
         shipping-product: thunderbird
         treeherder:
             symbol: UV(UV)
             platform: linux64/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: linux64-nightly
+            build_platform: linux64-shippable
 
     thunderbird-linux:
         description: linux update verify
         shipping-product: thunderbird
         treeherder:
             symbol: UV(UV)
             platform: linux32/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: linux-nightly
+            build_platform: linux-shippable
 
     thunderbird-win64:
         description: win64 update verify
         shipping-product: thunderbird
         treeherder:
             symbol: UV(UV)
             platform: windows2012-64/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: win64-nightly
+            build_platform: win64-shippable
 
     thunderbird-win32:
         description: win32 update verify
         shipping-product: thunderbird
         treeherder:
             symbol: UV(UV)
             platform: windows2012-32/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: win32-nightly
+            build_platform: win32-shippable
 
     thunderbird-macosx64:
         description: macosx64 update verify
         shipping-product: thunderbird
         treeherder:
             symbol: UV(UV)
             platform: osx-cross/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: macosx64-nightly
+            build_platform: macosx64-shippable

--- a/taskcluster/ci/repackage-l10n/kind.yml
+++ b/taskcluster/ci/repackage-l10n/kind.yml
@@ -13,21 +13,21 @@ transforms:
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 kind-dependencies:
     - nightly-l10n-signing
     - 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:
         comm-checkout: true
         config-paths:
             - comm/mozharness
         config:
             by-build-platform:

--- a/taskcluster/ci/repackage-msi/kind.yml
+++ b/taskcluster/ci/repackage-msi/kind.yml
@@ -12,18 +12,18 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - repackage-signing
     - repackage-signing-l10n
     - fetch
 
 only-for-build-platforms:
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - win32-shippable/opt
+    - win64-shippable/opt
 
 job-template:
     mozharness:
         config:
             by-build-platform:
                 win32\b.*:
                     - repackage/base.py
                     - repackage/win32_signed.py

--- a/taskcluster/ci/repackage-signing-l10n/kind.yml
+++ b/taskcluster/ci/repackage-signing-l10n/kind.yml
@@ -10,10 +10,10 @@ transforms:
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 
 kind-dependencies:
     - repackage-l10n
 
 only-for-build-platforms:
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - win32-shippable/opt
+    - win64-shippable/opt

--- a/taskcluster/ci/repackage-signing-msi/kind.yml
+++ b/taskcluster/ci/repackage-signing-msi/kind.yml
@@ -8,12 +8,12 @@ transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.repackage_signing:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - repackage-msi
 
 only-for-build-platforms:
-    - win32-nightly/opt
+    - win32-shippableopt
     - win32/opt
-    - win64-nightly/opt
+    - win64-shippable/opt
     - win64/opt

--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing/kind.yml
@@ -10,10 +10,10 @@ transforms:
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 
 kind-dependencies:
     - repackage
 
 only-for-build-platforms:
-    - win32-nightly/opt
-    - win64-nightly/opt
+    - win32-shippable/opt
+    - win64-shippable/opt

--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -12,21 +12,21 @@ transforms:
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 kind-dependencies:
     - build-signing
     - 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:
         comm-checkout: true
         config-paths:
             - comm/mozharness
         config:
             by-build-platform:

--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -15,35 +15,29 @@
 # Linux platforms (matching /linux.*/)
 
 linux64/opt:
     build-platform: linux64/opt
     test-sets:
         - 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
 
 linux64/debug:
     build-platform: 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
 
 linux32/debug:
     build-platform: linux/debug
     test-sets:
         - common-tests
@@ -52,55 +46,49 @@ linux32/debug:
 
 # win32
 windows7-32/opt:
     build-platform: win32/opt
     test-sets:
         - 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
 
 windows7-32/debug:
     build-platform: win32/debug
     test-sets:
         - common-tests
 
 # win64
 windows10-64/opt:
     build-platform: win64/opt
     test-sets:
         - 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
 
 windows10-64/debug:
     build-platform: win64/debug
     test-sets:
         - common-tests
 
 # MacOS X platforms (matching /macosx.*/)
 
 macosx64/debug:
     build-platform: macosx64/debug
     test-sets:
         - common-tests
 
-macosx64/opt:
-    build-platform: macosx64/opt
+macosx64-shippable/opt:
+    build-platform: macosx64-shippable/opt
     test-sets:
         - common-tests
         - optimized-tests
-
-macosx64-nightly/opt:
-    build-platform: macosx64-nightly/opt
-    test-sets:
-        - common-tests
-        - optimized-tests

--- a/taskcluster/ci/upload-symbols/kind.yml
+++ b/taskcluster/ci/upload-symbols/kind.yml
@@ -8,21 +8,21 @@ transforms:
     - taskgraph.transforms.upload_symbols:transforms
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 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
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 900
         env: