--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -254,16 +254,17 @@ PLATFORM_VARS = {
                         ],
             'mock_copyin_files': [
                 ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
                 ('/home/cltbld/.hgrc', '/builds/.hgrc'),
                 ('/home/cltbld/.boto', '/builds/.boto'),
                 ('/builds/gapi.data', '/builds/gapi.data'),
                 ('/tools/tooltool.py', '/builds/tooltool.py'),
                 ('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
+                ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
             ],
         },
         'linux64': {
             'mozharness_python': '/tools/buildbot/bin/python',
             'reboot_command': [
                 '/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
                 '-f', '../reboot_count.txt', '-n', '1', '-z'
             ],
@@ -362,16 +363,17 @@ PLATFORM_VARS = {
                         ],
             'mock_copyin_files': [
                 ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
                 ('/home/cltbld/.hgrc', '/builds/.hgrc'),
                 ('/home/cltbld/.boto', '/builds/.boto'),
                 ('/builds/gapi.data', '/builds/gapi.data'),
                 ('/tools/tooltool.py', '/builds/tooltool.py'),
                 ('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
+                ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
             ],
         },
         'linux64-asan': {
             'mozharness_python': '/tools/buildbot/bin/python',
             'reboot_command': [
                 '/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
                 '-f', '../reboot_count.txt', '-n', '1', '-z'
             ],
@@ -455,16 +457,17 @@ PLATFORM_VARS = {
                         'freetype-devel-2.3.11-6.el6_1.8.x86_64',
                         ],
             'mock_copyin_files': [
                 ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
                 ('/home/cltbld/.hgrc', '/builds/.hgrc'),
                 ('/home/cltbld/.boto', '/builds/.boto'),
                 ('/builds/gapi.data', '/builds/gapi.data'),
                 ('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
+                ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
             ],
             # The status of this build doesn't affect the last good revision
             # algorithm for nightlies
             'consider_for_nightly': False,
         },
         'linux64-asan-debug': {
             'mozharness_python': '/tools/buildbot/bin/python',
             'reboot_command': [
@@ -552,16 +555,17 @@ PLATFORM_VARS = {
                         'freetype-devel-2.3.11-6.el6_1.8.x86_64',
                         ],
             'mock_copyin_files': [
                 ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
                 ('/home/cltbld/.hgrc', '/builds/.hgrc'),
                 ('/home/cltbld/.boto', '/builds/.boto'),
                 ('/builds/gapi.data', '/builds/gapi.data'),
                 ('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
+                ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
             ],
             # The status of this build doesn't affect the last good revision
             # algorithm for nightlies
             'consider_for_nightly': False,
         },
         'linux64-st-an-debug': {
             'mozharness_python': '/tools/buildbot/bin/python',
             'reboot_command': [
@@ -649,16 +653,17 @@ PLATFORM_VARS = {
                         'gstreamer-devel', 'gstreamer-plugins-base-devel',
                         ],
             'mock_copyin_files': [
                 ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
                 ('/home/cltbld/.hgrc', '/builds/.hgrc'),
                 ('/home/cltbld/.boto', '/builds/.boto'),
                 ('/builds/gapi.data', '/builds/gapi.data'),
                 ('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
+                ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
             ],
             # The status of this build doesn't affect the last good revision
             # algorithm for nightlies
             'consider_for_nightly': False,
         },
         'linux64-sh-haz': {
             'mozharness_config': {
                 'script_name': 'scripts/spidermonkey_build.py',
@@ -793,16 +798,17 @@ PLATFORM_VARS = {
                         ],
             'mock_copyin_files': [
                 ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
                 ('/home/cltbld/.hgrc', '/builds/.hgrc'),
                 ('/home/cltbld/.boto', '/builds/.boto'),
                 ('/builds/gapi.data', '/builds/gapi.data'),
                 ('/tools/tooltool.py', '/builds/tooltool.py'),
                 ('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
+                ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
             ],
         },
         'macosx64': {
             'mozharness_python': '/tools/buildbot/bin/python',
             'reboot_command': ['scripts/external_tools/count_and_reboot.py',
                                '-f', '../reboot_count.txt', '-n', '1', '-z'],
             'mozharness_desktop_build': {
                 'script_name': 'scripts/fx_desktop_build.py',
@@ -1128,16 +1134,17 @@ PLATFORM_VARS = {
                         'freetype-2.3.11-6.el6_1.8.x86_64',
                         ],
             'mock_copyin_files': [
                 ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
                 ('/home/cltbld/.hgrc', '/builds/.hgrc'),
                 ('/home/cltbld/.boto', '/builds/.boto'),
                 ('/builds/gapi.data', '/builds/gapi.data'),
                 ('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
+                ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
             ],
         },
         'linux64-debug': {
             'mozharness_python': '/tools/buildbot/bin/python',
             'reboot_command': [
                 '/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
                 '-f', '../reboot_count.txt', '-n', '1', '-z'
             ],
@@ -1218,16 +1225,17 @@ PLATFORM_VARS = {
                         'gstreamer-devel', 'gstreamer-plugins-base-devel',
                         ],
             'mock_copyin_files': [
                 ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
                 ('/home/cltbld/.hgrc', '/builds/.hgrc'),
                 ('/home/cltbld/.boto', '/builds/.boto'),
                 ('/builds/gapi.data', '/builds/gapi.data'),
                 ('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
+                ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
             ],
         },
         'macosx64-debug': {
             'mozharness_python': '/tools/buildbot/bin/python',
             'reboot_command': ['scripts/external_tools/count_and_reboot.py',
                                '-f', '../reboot_count.txt', '-n', '1', '-z'],
             'mozharness_desktop_build': {
                 'script_name': 'scripts/fx_desktop_build.py',