--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -80,17 +80,17 @@ BRANCHES = {
         },
         'lock_platforms': True,
     },
     'mozilla-b2g34_v2_1s': {
         'datazilla_url': None,
         'gecko_version': 34,
         'platforms': {
             # desktop per sicking in Bug 829513
-            'linux': {},
+            'linux64': {},
         },
         'lock_platforms': True,
     },
     'mozilla-b2g37_v2_2': {
         'datazilla_url': None,
         'gecko_version': 37,
         'platforms': {
             # desktop per sicking in Bug 829513
@@ -1923,17 +1923,17 @@ BRANCHES['mozilla-b2g34_v2_1']['platform
 BRANCHES['mozilla-b2g34_v2_1']['platforms']['macosx64']['slave_platforms'] = ['snowleopard']
 BRANCHES['mozilla-b2g34_v2_1']['platforms']['macosx64']['talos_slave_platforms'] = []
 BRANCHES['mozilla-b2g34_v2_1']['platforms']['linux']['talos_slave_platforms'] = []
 BRANCHES['mozilla-b2g34_v2_1']['platforms']['linux64']['talos_slave_platforms'] = []
 
 ######### mozilla-b2g34_v2_1s
 BRANCHES['mozilla-b2g34_v2_1s']['repo_path'] = "releases/mozilla-b2g34_v2_1s"
 BRANCHES['mozilla-b2g34_v2_1s']['pgo_strategy'] = None
-BRANCHES['mozilla-b2g34_v2_1s']['platforms']['linux']['ubuntu32_vm']['debug_unittest_suites'] = []
+BRANCHES['mozilla-b2g34_v2_1s']['platforms']['linux64']['ubuntu64_vm']['debug_unittest_suites'] = []
 
 ######### mozilla-b2g37_v2_2
 BRANCHES['mozilla-b2g37_v2_2']['repo_path'] = "releases/mozilla-b2g37_v2_2"
 BRANCHES['mozilla-b2g37_v2_2']['pgo_strategy'] = None
 BRANCHES['mozilla-b2g37_v2_2']['platforms']['win32']['talos_slave_platforms'] = []
 BRANCHES['mozilla-b2g37_v2_2']['platforms']['macosx64']['slave_platforms'] = ['snowleopard']
 BRANCHES['mozilla-b2g37_v2_2']['platforms']['macosx64']['talos_slave_platforms'] = []
 BRANCHES['mozilla-b2g37_v2_2']['platforms']['linux']['talos_slave_platforms'] = []

--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -1387,28 +1387,34 @@ BRANCHES['mozilla-b2g34_v2_1']['platform
 BRANCHES['mozilla-b2g34_v2_1']['platforms']['dolphin_eng']['enable_nightly'] = False
 
 ######## mozilla-b2g34_v2_1s
 # This is a path, relative to HGURL, where the repository is located
 # HGURL + repo_path should be a valid repository
 BRANCHES['mozilla-b2g34_v2_1s']['repo_path'] = 'releases/mozilla-b2g34_v2_1s'
 BRANCHES['mozilla-b2g34_v2_1s']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v2_1/'
 BRANCHES['mozilla-b2g34_v2_1s']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-beta'
-BRANCHES['mozilla-b2g34_v2_1s']['start_hour'] = [0, 16]
+BRANCHES['mozilla-b2g34_v2_1s']['start_hour'] = [0]
 BRANCHES['mozilla-b2g34_v2_1s']['start_minute'] = [12]
 BRANCHES['mozilla-b2g34_v2_1s']['periodic_start_minute'] = 30
-BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator-jb']['enable_nightly'] = True
-BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator-jb-debug']['enable_nightly'] = True
+BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator']['enable_nightly'] = False
+BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator-debug']['enable_nightly'] = False
+BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator-jb']['enable_nightly'] = False
+BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator-jb-debug']['enable_nightly'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator-kk']['enable_nightly'] = True
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['emulator-kk-debug']['enable_nightly'] = True
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['dolphin']['enable_nightly'] = True
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['dolphin_eng']['enable_nightly'] = True
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['dolphin-512']['enable_nightly'] = True
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['dolphin-512_eng']['enable_nightly'] = True
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['dolphin-512_eng']['enable_dep'] = True
+BRANCHES['mozilla-b2g34_v2_1s']['platforms']['macosx64_gecko']['enable_nightly'] = False
+BRANCHES['mozilla-b2g34_v2_1s']['platforms']['macosx64_gecko-debug']['enable_nightly'] = False
+BRANCHES['mozilla-b2g34_v2_1s']['platforms']['win32_gecko']['enable_nightly'] = False
+BRANCHES['mozilla-b2g34_v2_1s']['platforms']['win32_gecko-debug']['enable_nightly'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['flame-kk']['enable_periodic'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['flame-kk_eng']['enable_periodic'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['flame-kk_eng']['enable_dep'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['flame-kk_eng-debug']['enable_periodic'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['nexus-4']['enable_periodic'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['nexus-4_eng']['enable_periodic'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['nexus-5-l']['enable_periodic'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['platforms']['nexus-5-l_eng']['enable_periodic'] = False

--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2175,16 +2175,17 @@ BRANCHES = {
     },
     'mozilla-b2g34_v2_1s': {
         'merge_builds': False,
         'branch_projects': [],
         'lock_platforms': True,
         'gecko_version': 34,
         'platforms': {
             'linux': {},
+            'linux64': {},
         },
     },
     'mozilla-b2g37_v2_2': {
         'merge_builds': False,
         'branch_projects': [],
         'lock_platforms': True,
         'gecko_version': 37,
         'platforms': {
@@ -2632,17 +2633,17 @@ BRANCHES['mozilla-b2g34_v2_1s']['start_m
 BRANCHES['mozilla-b2g34_v2_1s']['enable_xulrunner'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['pgo_platforms'] = []
 BRANCHES['mozilla-b2g34_v2_1s']['enable_mac_a11y'] = True
 BRANCHES['mozilla-b2g34_v2_1s']['unittest_build_space'] = 6
 # L10n configuration
 BRANCHES['mozilla-b2g34_v2_1s']['enable_l10n'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['enable_l10n_onchange'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['l10nNightlyUpdate'] = False
-BRANCHES['mozilla-b2g34_v2_1s']['l10n_platforms'] = ['linux']
+BRANCHES['mozilla-b2g34_v2_1s']['l10n_platforms'] = ['linux', 'linux64']
 BRANCHES['mozilla-b2g34_v2_1s']['l10nDatedDirs'] = True
 BRANCHES['mozilla-b2g34_v2_1s']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g34_v2_1s'
 BRANCHES['mozilla-b2g34_v2_1s']['enable_nightly'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['create_partial'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['enable_blocklist_update'] = False
 BRANCHES['mozilla-b2g34_v2_1s']['enable_hsts_update'] = True
 BRANCHES['mozilla-b2g34_v2_1s']['enable_hpkp_update'] = True