diff --git a/taskcluster/ci/release-final-verify/kind.yml b/taskcluster/ci/release-final-verify/kind.yml
index a70694167e33..ec3c0633990a 100644
--- a/taskcluster/ci/release-final-verify/kind.yml
+++ b/taskcluster/ci/release-final-verify/kind.yml
@@ -101,7 +101,7 @@ jobs:
                by-project:
                   jamun: "aurora-devedition-linux.cfg aurora-devedition-linux64.cfg aurora-devedition-macosx64.cfg aurora-devedition-win32.cfg aurora-devedition-win64.cfg"
                   maple: "aurora-devedition-linux.cfg aurora-devedition-linux64.cfg aurora-devedition-macosx64.cfg aurora-devedition-win32.cfg aurora-devedition-win64.cfg"
-                  mozilla-aurora: "aurora-devedition-linux.cfg aurora-devedition-linux64.cfg aurora-devedition-macosx64.cfg aurora-devedition-win32.cfg aurora-devedition-win64.cfg"
+                  mozilla-beta: "aurora-devedition-linux.cfg aurora-devedition-linux64.cfg aurora-devedition-macosx64.cfg aurora-devedition-win32.cfg aurora-devedition-win64.cfg"
                   mozilla-release: "release-devedition-linux.cfg release-devedition-linux64.cfg release-devedition-macosx64.cfg release-devedition-win32.cfg release-devedition-win64.cfg"
                   mozilla-esr52: "esr-devedition-linux.cfg esr-devedition-linux64.cfg esr-devedition-macosx64.cfg esr-devedition-win32.cfg esr-devedition-win64.cfg"
                   default: ""
diff --git a/taskcluster/ci/release-update-verify/kind.yml b/taskcluster/ci/release-update-verify/kind.yml
index eb805eaf1d81..94d1ba4ce05b 100644
--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -338,7 +338,7 @@ jobs:
                by-project:
                   jamun: "aurora-localtest"
                   maple: "aurora-localtest"
-                  mozilla-aurora: "aurora-localtest"
+                  mozilla-beta: "aurora-localtest"
                   mozilla-release: "release-localtest"
                   mozilla-esr52: "esr-localtest"
                   default: "default"
@@ -346,7 +346,7 @@ jobs:
                by-project:
                   jamun: "aurora-devedition-linux64.cfg"
                   maple: "aurora-devedition-linux64.cfg"
-                  mozilla-aurora: "aurora-devedition-linux64.cfg"
+                  mozilla-beta: "aurora-devedition-linux64.cfg"
                   mozilla-release: "release-devedition-linux64.cfg"
                   mozilla-esr52: "esr-devedition-linux64.cfg"
                   default: "none"
@@ -367,7 +367,7 @@ jobs:
                by-project:
                   jamun: "aurora-localtest"
                   maple: "aurora-localtest"
-                  mozilla-aurora: "aurora-localtest"
+                  mozilla-beta: "aurora-localtest"
                   mozilla-release: "release-localtest"
                   mozilla-esr52: "esr-localtest"
                   default: "default"
@@ -375,7 +375,7 @@ jobs:
                by-project:
                   jamun: "aurora-devedition-linux.cfg"
                   maple: "aurora-devedition-linux.cfg"
-                  mozilla-aurora: "aurora-devedition-linux.cfg"
+                  mozilla-beta: "aurora-devedition-linux.cfg"
                   mozilla-release: "release-devedition-linux.cfg"
                   mozilla-esr52: "esr-devedition-linux.cfg"
                   default: "none"
@@ -396,7 +396,7 @@ jobs:
                by-project:
                   jamun: "aurora-localtest"
                   maple: "aurora-localtest"
-                  mozilla-aurora: "aurora-localtest"
+                  mozilla-beta: "aurora-localtest"
                   mozilla-release: "release-localtest"
                   mozilla-esr52: "esr-localtest"
                   default: "default"
@@ -404,7 +404,7 @@ jobs:
                by-project:
                   jamun: "aurora-devedition-win64.cfg"
                   maple: "aurora-devedition-win64.cfg"
-                  mozilla-aurora: "aurora-devedition-win64.cfg"
+                  mozilla-beta: "aurora-devedition-win64.cfg"
                   mozilla-release: "release-devedition-win64.cfg"
                   mozilla-esr52: "esr-devedition-win64.cfg"
                   default: "none"
@@ -425,7 +425,7 @@ jobs:
                by-project:
                   jamun: "aurora-localtest"
                   maple: "aurora-localtest"
-                  mozilla-aurora: "aurora-localtest"
+                  mozilla-beta: "aurora-localtest"
                   mozilla-release: "release-localtest"
                   mozilla-esr52: "esr-localtest"
                   default: "default"
@@ -433,7 +433,7 @@ jobs:
                by-project:
                   jamun: "aurora-devedition-win32.cfg"
                   maple: "aurora-devedition-win32.cfg"
-                  mozilla-aurora: "aurora-devedition-win32.cfg"
+                  mozilla-beta: "aurora-devedition-win32.cfg"
                   mozilla-release: "release-devedition-win32.cfg"
                   mozilla-esr52: "esr-devedition-win32.cfg"
                   default: "none"
@@ -454,7 +454,7 @@ jobs:
                by-project:
                   jamun: "aurora-localtest"
                   maple: "aurora-localtest"
-                  mozilla-aurora: "aurora-localtest"
+                  mozilla-beta: "aurora-localtest"
                   mozilla-release: "release-localtest"
                   mozilla-esr52: "esr-localtest"
                   default: "default"
@@ -462,7 +462,7 @@ jobs:
                by-project:
                   jamun: "aurora-devedition-macosx64.cfg"
                   maple: "aurora-devedition-macosx64.cfg"
-                  mozilla-aurora: "aurora-devedition-macosx64.cfg"
+                  mozilla-beta: "aurora-devedition-macosx64.cfg"
                   mozilla-release: "release-devedition-macosx64.cfg"
                   mozilla-esr52: "esr-devedition-macosx64.cfg"
                   default: "none"
diff --git a/taskcluster/ci/release-updates-builder/kind.yml b/taskcluster/ci/release-updates-builder/kind.yml
index a04b0482ae29..ec4adbffb8bc 100644
--- a/taskcluster/ci/release-updates-builder/kind.yml
+++ b/taskcluster/ci/release-updates-builder/kind.yml
@@ -129,7 +129,7 @@ jobs:
                by-project:
                   jamun: "aurora"
                   maple: "aurora"
-                  mozilla-aurora: "aurora"
+                  mozilla-beta: "aurora"
                   default: "default"
             repo_path:
                by-project: