--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -1333,16 +1333,21 @@ PLATFORM_VARS = {
         'stage_product': 'b2g',
         'product_name': 'b2g',
         'base_name': builder_prefix + '_%(branch)s_%(platform)s',
         'slaves': SLAVES['mock'],
         'maxTime': 6 * 3600,
         'try_by_default': True,
         'consider_for_nightly': False,
         'mock_target': 'mozilla-centos6-x86_64',
+        'reboot_command': [
+            '/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
+            '-f', '../reboot_count.txt', '-n', '1', '-z'
+        ],
+        'builds_before_reboot': b2g_localconfig.BUILDS_BEFORE_REBOOT,
     },
     'emulator-kk': {
         'mozharness_config': {
             'script_name': 'scripts/b2g_build.py',
             # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
             # --target name below
             'extra_args': ['--target', 'emulator-kk', '--config', 'b2g/releng-emulator.py',
                            '--gaia-languages-file', 'locales/languages_dev.json',

--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -674,16 +674,21 @@ PLATFORM_VARS = {
             },
             'stage_product': 'firefox',
             'product_name': 'firefox',
             'base_name': '%(platform)s_%(branch)s',
             'slaves': SLAVES['mock'],
             'try_by_default': False,
             'consider_for_nightly': False,
             'mock_target': 'mozilla-centos6-x86_64',
+            'reboot_command': [
+                '/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
+                '-f', '../reboot_count.txt', '-n', '1', '-z'
+            ],
+            'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
         },
         'linux64-br-haz': {
             'mozharness_config': {
                 'script_name': 'scripts/spidermonkey_build.py',
                 'extra_args': [
                     '--config-file', 'hazards/build_browser.py',
                     '--config-file', 'hazards/common.py',
                 ],
@@ -696,16 +701,21 @@ PLATFORM_VARS = {
             },
             'stage_product': 'firefox',
             'product_name': 'firefox',
             'base_name': '%(platform)s_%(branch)s',
             'slaves': SLAVES['mock'],
             'try_by_default': True,
             'consider_for_nightly': False,
             'mock_target': 'mozilla-centos6-x86_64',
+            'reboot_command': [
+                '/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
+                '-f', '../reboot_count.txt', '-n', '1', '-z'
+            ],
+            'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
         },
         'linux64-cc': {
             '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',
                 'extra_args': [