diff --git a/taskcluster/ci/build/android.yml b/taskcluster/ci/build/android.yml
index c553e5ed7881..61e99cd3f859 100644
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -101,6 +101,8 @@ android-x86-nightly/opt:
     description: "Android 4.2 x86 Nightly"
     attributes:
         nightly: true
+    shipping-phase: promote
+    shipping-product: fennec
     index:
         product: mobile
         job-name: android-x86-opt
@@ -204,6 +206,8 @@ android-api-16-nightly/opt:
     description: "Android 4.0 api-16+ Nightly"
     attributes:
         nightly: true
+    shipping-phase: promote
+    shipping-product: fennec
     index:
         product: mobile
         job-name: android-api-16-opt
@@ -558,6 +562,8 @@ android-aarch64-nightly/opt:
     description: "Android 5.0 AArch64 Nightly"
     attributes:
         nightly: true
+    shipping-phase: promote
+    shipping-product: fennec
     index:
         product: mobile
         job-name: android-aarch64-opt
diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml
index 0d5774d69457..b8481344605d 100644
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -158,6 +158,8 @@ linux64-devedition-nightly/opt:
     description: "Linux64 devedition Nightly"
     attributes:
         nightly: true
+    shipping-phase: build
+    shipping-product: devedition
     index:
         product: devedition
         job-name: linux64-opt
@@ -178,6 +180,7 @@ linux64-devedition-nightly/opt:
             - builds/releng_base_linux_64_builds.py
             - disable_signing.py
             - balrog/production.py
+            - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         tooltool-downloads: public
@@ -417,6 +420,8 @@ linux-devedition-nightly/opt:
     description: "Linux32 devedition Nightly"
     attributes:
         nightly: true
+    shipping-phase: build
+    shipping-product: devedition
     index:
         product: devedition
         job-name: linux-opt
@@ -437,6 +442,7 @@ linux-devedition-nightly/opt:
             - builds/releng_base_linux_32_builds.py
             - disable_signing.py
             - balrog/production.py
+            - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         tooltool-downloads: public
@@ -453,6 +459,8 @@ linux-nightly/opt:
     description: "Linux32 Nightly"
     attributes:
         nightly: true
+    shipping-phase: build
+    shipping-product: firefox
     index:
         product: firefox
         job-name: linux-opt
@@ -617,6 +625,8 @@ linux64-nightly/opt:
     description: "Linux64 Nightly"
     attributes:
         nightly: true
+    shipping-phase: build
+    shipping-product: firefox
     index:
         product: firefox
         job-name: linux64-opt
diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml
index 3a389dd829dc..53f63aead52f 100644
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -98,6 +98,8 @@ macosx64-devedition-nightly/opt:
     description: "MacOS X Dev Edition x64 Nightly"
     attributes:
         nightly: true
+    shipping-phase: build
+    shipping-product: devedition
     index:
         product: devedition
         job-name: macosx64-opt
@@ -206,6 +208,8 @@ macosx64-nightly/opt:
     description: "MacOS X x64 Cross-compile Nightly"
     attributes:
         nightly: true
+    shipping-phase: build
+    shipping-product: firefox
     index:
         product: firefox
         job-name: macosx64-opt
diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml
index d52dbd490d5c..75a2a59e6a0f 100755
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -206,6 +206,8 @@ win32-nightly/opt:
         type: nightly
     attributes:
         nightly: true
+    shipping-phase: build
+    shipping-product: firefox
     treeherder:
         platform: windows2012-32/opt
         symbol: tc(N)
@@ -240,6 +242,8 @@ win64-nightly/opt:
         type: nightly
     attributes:
         nightly: true
+    shipping-phase: build
+    shipping-product: firefox
     treeherder:
         platform: windows2012-64/opt
         symbol: tc(N)
@@ -567,6 +571,8 @@ win32-devedition-nightly/opt:
         type: nightly
     attributes:
         nightly: true
+    shipping-phase: build
+    shipping-product: devedition
     treeherder:
         platform: windows2012-32-devedition/opt
         symbol: tc(N)
@@ -602,6 +608,8 @@ win64-devedition-nightly/opt:
         type: nightly
     attributes:
         nightly: true
+    shipping-phase: build
+    shipping-product: devedition
     treeherder:
         platform: windows2012-64-devedition/opt
         symbol: tc(N)