--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2693,24 +2693,24 @@ for name, branch in items_at_least(BRANC
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 53):
     for platform in branch['platforms'].keys():
         if platform not in ['linux-debug']:
             continue
         del branch['platforms'][platform]
 
 # Bug 1330680 - patches to disable bb nightlies on linux32/linux64/android on m-c + trunk
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 53):
-    for platform in branch['platforms'].keys():
+    for platform in branch['platforms']:
         if platform not in ['linux', 'linux64', 'android-api-15', 'android-x86']:
             continue
         # Bug 1332930 Shutting off buildbot nighties shut off periodicupdates
-        if platform not in ['linux64']:
-            del branch['platforms'][platform]
-        else:
-            branch['platforms'][platform]['enable_dep'] = False
+        branch['platforms'][platform]['enable_dep'] = False
+        branch['platforms'][platform]['enable_nightly'] = False
+        if platform in branch['pgo_platforms']:
+            branch['pgo_platforms'] = [p for p in branch['pgo_platforms'] if p != platform]
 
 
 if __name__ == "__main__":
     import sys
     import pprint
     args = sys.argv[1:]
 
     if len(args) > 0:

--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -120,17 +120,17 @@ PROJECT_BRANCHES = {
     },
     # Disabled by Bug 1135702
     # 'fig': {},
     # Disabled by Bug 1206269
     # 'gum': {},
     # disabled in bug 1215527
     # 'holly': {},
     'jamun': {
-        'gecko_version': 47,
+        'gecko_version': 53,
         'watch_all_branches': True,
         'desktop_mozharness_builds_enabled': True,
         'use_mozharness_repo_cache': False,
         'branch_projects': [],
         ## TODO - enabled tests.
         # note - to enable tests you must also remove:
         # platforms[platform]["slave_platforms"] item override below
         'enable_opt_unittests': False,
@@ -138,20 +138,22 @@ PROJECT_BRANCHES = {
         'enable_talos': False,
         ##
         'lock_platforms': True,
         'platforms': {
             # use default 'dep-signing' for now while in development
             'linux': {
                 'dep_signing_servers': 'release-signing',
                 "slave_platforms": [],
+                "enable_dep": False,
             },
             'linux64': {
                 'dep_signing_servers': 'release-signing',
                 "slave_platforms": [],
+                "enable_dep": False,
             },
             'win32': {
                 'dep_signing_servers': 'release-signing',
                 "slave_platforms": [],
             },
             'win64': {
                 'dep_signing_servers': 'release-signing',
                 "slave_platforms": [],
@@ -173,16 +175,18 @@ PROJECT_BRANCHES = {
                 "slave_platforms": [],
             },
             'win32-debug': {
                 "slave_platforms": [],
             },
             'win64-debug': {
                 "slave_platforms": [],
             },
+            'android-api-15': {},
+            'android-x86': {},
         },
         'pgo_strategy': 'per-checkin',
         'enable_release_promotion': True,
         'build_tools_repo_path': 'users/raliiev_mozilla.com/tools',
         "release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
         "l10n_release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
         "single_locale_branch_config": "dev-mozilla-release",
         'release_channel_mappings': [