--- 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",
         },
     },
     "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",

--- 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",
         },
     },
     "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",

--- 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",
         },
     },
     "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",

--- 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",
         },
     },
     "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",

--- 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",
         },
     },
     "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",

--- 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",
         },
     },
     "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
     "gittool_share_base": "/builds/git-shared/git",
     "gittool_base_mirror_urls": [],
     "hgtool_share_base": "/builds/hg-shared",