diff --git a/taskcluster/ci/release-generate-checksums/kind.yml b/taskcluster/ci/release-generate-checksums/kind.yml
index 0315bbf539bc..71018c8cefa4 100644
--- a/taskcluster/ci/release-generate-checksums/kind.yml
+++ b/taskcluster/ci/release-generate-checksums/kind.yml
@@ -61,10 +61,10 @@ jobs:
                 by-release-level:
                     production:
                         stage_product: "firefox"
-                        bucket_name: "net-mozaws-prod-delivery-firefox"
+                        bucket_name: "moz-fx-productdelivery-pr-38b5-productdelivery"
                     staging:
                         stage_product: "firefox"
-                        bucket_name: "net-mozaws-stage-delivery-firefox"
+                        bucket_name: "moz-fx-productdelivery-no-7d6a-productdelivery"
         treeherder:
             platform: firefox-release/opt
 
@@ -78,9 +78,9 @@ jobs:
                 by-release-level:
                     production:
                         stage_product: "devedition"
-                        bucket_name: "net-mozaws-prod-delivery-archive"
+                        bucket_name: "moz-fx-productdelivery-pr-38b5-productdelivery"
                     staging:
                         stage_product: "devedition"
-                        bucket_name: "net-mozaws-stage-delivery-archive"
+                        bucket_name: "moz-fx-productdelivery-no-7d6a-productdelivery"
         treeherder:
             platform: devedition-release/opt
diff --git a/testing/mozharness/scripts/release/generate-checksums.py b/testing/mozharness/scripts/release/generate-checksums.py
index 6d01923e444c..ae092ae4de9b 100644
--- a/testing/mozharness/scripts/release/generate-checksums.py
+++ b/testing/mozharness/scripts/release/generate-checksums.py
@@ -47,7 +47,7 @@ class ChecksumsGenerator(BaseScript, VirtualenvMixin):
             ["--bucket-name"],
             {
                 "dest": "bucket_name",
-                "help": "Full bucket name e.g.: net-mozaws-prod-delivery-{firefox,archive}.",
+                "help": "Full bucket name e.g.: moz-fx-productdelivery-pr-38b5-productdelivery.",
             },
         ],
         [
@@ -152,7 +152,7 @@ class ChecksumsGenerator(BaseScript, VirtualenvMixin):
         from boto import connect_s3
 
         self.info("Connecting to S3")
-        conn = connect_s3(anon=True)
+        conn = connect_s3(anon=True, host="storage.googleapis.com")
         self.info("Connecting to bucket {}".format(self.config["bucket_name"]))
         self.bucket = conn.get_bucket(self.config["bucket_name"])
         return self.bucket