--- a/testing/mozharness/configs/b2g/releng-emulator.py
+++ b/testing/mozharness/configs/b2g/releng-emulator.py
@@ -6,34 +6,35 @@ config = {
         'checkout-sources',
         'get-blobs',
         'update-source-manifest',
         'build',
         'build-symbols',
         'make-updates',
         'prep-upload',
         'upload',
-        'make-socorro-json',
-        'upload-source-manifest',
+        # bug 1222227 - temporarily disable for S3 migration
+        # 'make-socorro-json',
+        # 'upload-source-manifest',
     ],
     "upload": {
         "default": {
             "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
             "ssh_user": "b2gbld",
             "upload_remote_host": "pvtbuilds2.dmz.scl3.mozilla.com",
             "upload_remote_path": "/pub/mozilla.org/b2g/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
             "upload_remote_symlink": "/pub/mozilla.org/b2g/tinderbox-builds/%(branch)s-%(target)s/latest",
             "upload_remote_nightly_path": "/pub/mozilla.org/b2g/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
             "upload_remote_nightly_symlink": "/pub/mozilla.org/b2g/nightly/%(branch)s-%(target)s/latest",
             "upload_dep_target_exclusions": [],
         },
         "public": {
             "ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
             "ssh_user": "ffxbld",
-            "upload_remote_host": "stage.mozilla.org",
+            "upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
             "post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
             "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
         },
     },
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",
     "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],

--- a/testing/mozharness/configs/b2g/releng-fota-eng.py
+++ b/testing/mozharness/configs/b2g/releng-fota-eng.py
@@ -6,34 +6,35 @@ config = {
         'checkout-sources',
         'get-blobs',
         'update-source-manifest',
         'build',
         'build-symbols',
         'make-updates',
         'prep-upload',
         'upload',
-        'make-socorro-json',
-        'upload-source-manifest',
+        # bug 1222227 - temporarily disable for S3 migration
+        # 'make-socorro-json',
+        # 'upload-source-manifest',
     ],
     "upload": {
         "default": {
             "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
             "ssh_user": "b2gbld",
             "upload_remote_host": "pvtbuilds.pvt.build.mozilla.org",
             "upload_remote_path": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
             "upload_remote_symlink": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/latest",
             "upload_remote_nightly_path": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
             "upload_remote_nightly_symlink": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/latest",
             "upload_dep_target_exclusions": [],
         },
         "public": {
             "ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
             "ssh_user": "ffxbld",
-            "upload_remote_host": "stage.mozilla.org",
+            "upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
             "post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
             "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
         },
     },
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",
     "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],

--- a/testing/mozharness/configs/b2g/releng-fota-updates.py
+++ b/testing/mozharness/configs/b2g/releng-fota-updates.py
@@ -6,35 +6,36 @@ config = {
         'checkout-sources',
         'get-blobs',
         'update-source-manifest',
         'build',
         'build-symbols',
         'make-updates',
         'prep-upload',
         'upload',
-        'make-socorro-json',
-        'upload-source-manifest',
+        # bug 1222227 - temporarily disable for S3 migration
+        # 'make-socorro-json',
+        # 'upload-source-manifest',
         'submit-to-balrog',
     ],
     "upload": {
         "default": {
             "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
             "ssh_user": "b2gbld",
             "upload_remote_host": "pvtbuilds.pvt.build.mozilla.org",
             "upload_remote_path": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
             "upload_remote_symlink": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/latest",
             "upload_remote_nightly_path": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
             "upload_remote_nightly_symlink": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/latest",
             "upload_dep_target_exclusions": ["inari", "leo", "helix", "mako", "wasabi"],
         },
         "public": {
             "ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
             "ssh_user": "ffxbld",
-            "upload_remote_host": "stage.mozilla.org",
+            "upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
             "post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
             "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
         },
     },
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",
     "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],

--- a/testing/mozharness/configs/b2g/releng-otoro-eng.py
+++ b/testing/mozharness/configs/b2g/releng-otoro-eng.py
@@ -6,34 +6,35 @@ config = {
         'checkout-sources',
         'get-blobs',
         'update-source-manifest',
         'build',
         'build-symbols',
         'make-updates',
         'prep-upload',
         'upload',
-        'make-socorro-json',
-        'upload-source-manifest',
+        # bug 1222227 - temporarily disable for S3 migration
+        # 'make-socorro-json',
+        # 'upload-source-manifest',
     ],
     "upload": {
         "default": {
             "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
             "ssh_user": "b2gbld",
             "upload_remote_host": "pvtbuilds.pvt.build.mozilla.org",
             "upload_remote_path": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
             "upload_remote_symlink": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/latest",
             "upload_remote_nightly_path": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
             "upload_remote_nightly_symlink": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/latest",
             "upload_dep_target_exclusions": [],
         },
         "public": {
             "ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
             "ssh_user": "ffxbld",
-            "upload_remote_host": "stage.mozilla.org",
+            "upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
             "post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
             "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
         },
     },
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",
     "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],

--- a/testing/mozharness/configs/b2g/releng-otoro.py
+++ b/testing/mozharness/configs/b2g/releng-otoro.py
@@ -6,34 +6,35 @@ config = {
         'checkout-sources',
         'get-blobs',
         'update-source-manifest',
         'build',
         'build-symbols',
         'make-updates',
         'prep-upload',
         'upload',
-        'make-socorro-json',
-        'upload-source-manifest',
+        # bug 1222227 - temporarily disable for S3 migration
+        # 'make-socorro-json',
+        # 'upload-source-manifest',
     ],
     "upload": {
         "default": {
             "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
             "ssh_user": "b2gbld",
             "upload_remote_host": "pvtbuilds.pvt.build.mozilla.org",
             "upload_remote_path": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
             "upload_remote_symlink": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/latest",
             "upload_remote_nightly_path": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
             "upload_remote_nightly_symlink": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/latest",
             "upload_dep_target_exclusions": ["inari", "leo", "helix", "mako", "wasabi"],
         },
         "public": {
             "ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
             "ssh_user": "ffxbld",
-            "upload_remote_host": "stage.mozilla.org",
+            "upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
             "post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
             "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
         },
     },
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",
     "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],

--- a/testing/mozharness/configs/b2g/releng-private-updates.py
+++ b/testing/mozharness/configs/b2g/releng-private-updates.py
@@ -6,35 +6,36 @@ config = {
         'checkout-sources',
         'get-blobs',
         'update-source-manifest',
         'build',
         'build-symbols',
         'make-updates',
         'prep-upload',
         'upload',
-        'make-socorro-json',
-        'upload-source-manifest',
+        # bug 1222227 - temporarily disable for S3 migration
+        # 'make-socorro-json',
+        # 'upload-source-manifest',
         'submit-to-balrog',
     ],
     "upload": {
         "default": {
             "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
             "ssh_user": "b2gbld",
             "upload_remote_host": "pvtbuilds.pvt.build.mozilla.org",
             "upload_remote_path": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
             "upload_remote_symlink": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/latest",
             "upload_remote_nightly_path": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/%(year)04i/%(month)02i/%(year)04i-%(month)02i-%(day)02i-%(hour)02i-%(minute)02i-%(second)02i",
             "upload_remote_nightly_symlink": "/pvt/mozilla.org/b2gotoro/nightly/%(branch)s-%(target)s/latest",
             "upload_dep_target_exclusions": ["inari", "leo", "helix", "mako", "wasabi"],
         },
         "public": {
             "ssh_key": os.path.expanduser("~/.ssh/ffxbld_rsa"),
             "ssh_user": "ffxbld",
-            "upload_remote_host": "stage.mozilla.org",
+            "upload_remote_host": "upload.ffxbld.productdelivery.prod.mozaws.net",
             "post_upload_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds",
             "post_upload_nightly_cmd": "post_upload.py --tinderbox-builds-dir %(branch)s-%(target)s -b %(branch)s-%(target)s -p b2g -i %(buildid)s --revision %(revision)s --release-to-tinderbox-dated-builds --release-to-latest --release-to-dated",
         },
     },
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",
     "hgtool_base_bundle_urls": ["https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"],

--- a/testing/mozharness/configs/builds/branch_specifics.py
+++ b/testing/mozharness/configs/builds/branch_specifics.py
@@ -23,35 +23,24 @@
 #             },
 #             'win64': {
 #                 'enable_checktests': False,
 #             },
 #         }
 #     },
 # }
 
-# XXX Remove when we have the ability to push mulet to s3 for mac/win.
-_BUG1218570_OVERRIDES = {
-    'macosx64-mulet': {
-        'stage_server': 'stage.mozilla.org',
-    },
-    'win32-mulet': {
-        'stage_server': 'stage.mozilla.org',
-    },
-}
-
 config = {
     ### release branches
     "mozilla-central": {
         "repo_path": 'mozilla-central',
         "update_channel": "nightly",
         "graph_server_branch_name": "Firefox",
         'use_branch_in_symbols_extra_buildid': False,
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-        'platform_overrides': _BUG1218570_OVERRIDES,
     },
     'mozilla-release': {
         'repo_path': 'releases/mozilla-release',
         # TODO I think we can remove update_channel since we don't run
         # nightlies for mozilla-release
         'update_channel': 'release',
         'branch_uses_per_checkin_strategy': True,
         'use_branch_in_symbols_extra_buildid': False,
@@ -82,38 +71,34 @@ config = {
         'include_post_upload_builddir': True,
         'release_to_try_builds': True,
         'use_branch_in_symbols_extra_buildid': False,
         'stage_server': 'upload.trybld.productdelivery.prod.mozaws.net',
         'stage_username': 'trybld',
         'stage_ssh_key': 'trybld_dsa',
         'branch_supports_uploadsymbols': False,
         'use_clobberer': False,
-        'platform_overrides': _BUG1218570_OVERRIDES,
     },
 
     ### project branches
     'b2g-inbound': {
         'repo_path': 'integration/b2g-inbound',
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-        'platform_overrides': _BUG1218570_OVERRIDES,
     },
     'fx-team': {
         'repo_path': 'integration/fx-team',
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-        'platform_overrides': _BUG1218570_OVERRIDES,
     },
     'gum': {
         'branch_uses_per_checkin_strategy': True,
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'mozilla-inbound': {
         'repo_path': 'integration/mozilla-inbound',
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-        'platform_overrides': _BUG1218570_OVERRIDES,
     },
     'services-central': {
         'repo_path': 'services/services-central',
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'ux': {
         "graph_server_branch_name": "UX",
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
@@ -145,21 +130,19 @@ config = {
         # bug 1164935
         'branch_uses_per_checkin_strategy': True,
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
 
     ### other branches that do not require anything special:
     'alder': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-        'platform_overrides': _BUG1218570_OVERRIDES,
     },
     'ash': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-        'platform_overrides': _BUG1218570_OVERRIDES,
     },
     'birch': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     # 'build-system': {}
     'cedar': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
@@ -173,15 +156,13 @@ config = {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'larch': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     # 'maple': {},
     'oak': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-        'platform_overrides': _BUG1218570_OVERRIDES,
     },
     'pine': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
-        'platform_overrides': _BUG1218570_OVERRIDES,
     },
 }