diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt
index 12838fe680..78cf7f6ea2 100644
--- a/Documentation/dev-plugins.txt
+++ b/Documentation/dev-plugins.txt
@@ -64,7 +64,7 @@ When starting from this example one should take care to adapt the
 the plugin is developed. If the plugin is developed for a released
 Gerrit version (no `SNAPSHOT` version) then the URL for the
 `gerrit-api-repository` in the `pom.xml` needs to be changed to
-`https://gerrit-api.commondatastorage.googleapis.com/release/`.
+`https://gerrit-api.storage.googleapis.com/release/`.
 
 [[API]]
 API
diff --git a/Documentation/dev-release-deploy-config.txt b/Documentation/dev-release-deploy-config.txt
index ffdb6ea775..9c98fff8f1 100644
--- a/Documentation/dev-release-deploy-config.txt
+++ b/Documentation/dev-release-deploy-config.txt
@@ -73,7 +73,7 @@ deployable to the `gerrit-maven` storage bucket:
     <repository>
       <id>gerrit-maven-repository</id>
       <name>Gerrit Maven Repository</name>
-      <url>s3://gerrit-maven@commondatastorage.googleapis.com</url>
+      <url>gs://gerrit-maven</url>
       <uniqueVersion>true</uniqueVersion>
     </repository>
   </distributionManagement>
@@ -86,9 +86,9 @@ deployable to the `gerrit-maven` storage bucket:
   <build>
     <extensions>
       <extension>
-        <groupId>net.anzix.aws</groupId>
-        <artifactId>s3-maven-wagon</artifactId>
-        <version>3.2</version>
+        <groupId>com.googlesource.gerrit</groupId>
+        <artifactId>gs-maven-wagon</artifactId>
+        <version>3.3</version>
       </extension>
     </extensions>
   </build>
@@ -107,7 +107,7 @@ deployable to the `gerrit-plugins` storage bucket:
     <repository>
       <id>gerrit-plugins-repository</id>
       <name>Gerrit Plugins Repository</name>
-      <url>s3://gerrit-plugins@commondatastorage.googleapis.com</url>
+      <url>gs://gerrit-plugins</url>
       <uniqueVersion>true</uniqueVersion>
     </repository>
   </distributionManagement>
@@ -120,9 +120,9 @@ deployable to the `gerrit-plugins` storage bucket:
   <build>
     <extensions>
       <extension>
-        <groupId>net.anzix.aws</groupId>
-        <artifactId>s3-maven-wagon</artifactId>
-        <version>3.2</version>
+        <groupId>com.googlesource.gerrit</groupId>
+        <artifactId>gs-maven-wagon</artifactId>
+        <version>3.3</version>
       </extension>
     </extensions>
   </build>
diff --git a/Documentation/dev-release-subproject.txt b/Documentation/dev-release-subproject.txt
index 5e3770d1d5..956bd29b2e 100644
--- a/Documentation/dev-release-subproject.txt
+++ b/Documentation/dev-release-subproject.txt
@@ -13,9 +13,9 @@ release.
 `gerrit-api-repository` in the `pom.xml` is correct.
 +
 If `Gerrit-ApiVersion` references a released Gerrit version it must be
-`https://gerrit-api.commondatastorage.googleapis.com/release/`, if
+`https://gerrit-api.stoarge.googleapis.com/release/`, if
 `Gerrit-ApiVersion` references a snapshot Gerrit version it must be
-`https://gerrit-api.commondatastorage.googleapis.com/snapshot/`.
+`https://gerrit-api.storage.googleapis.com/snapshot/`.
 
 * Build the latest snapshot and install it into the local Maven
 repository:
diff --git a/Documentation/dev-release.txt b/Documentation/dev-release.txt
index cd7cd34ea7..c06d16a01a 100644
--- a/Documentation/dev-release.txt
+++ b/Documentation/dev-release.txt
@@ -157,7 +157,7 @@ Publish the Extension and Plugin API Jars
 link:dev-release-deploy-config.html#deploy-configuration-settings-xml[
 configuration needed for deployment]
 
-* Push the Jars to `commondatastorage.googleapis.com`:
+* Push the Jars to `storage.googleapis.com`:
 +
 ----
   ./tools/deploy_api.sh
diff --git a/ReleaseNotes/ReleaseNotes-2.6.txt b/ReleaseNotes/ReleaseNotes-2.6.txt
index b5b8e39978..e562ceca11 100644
--- a/ReleaseNotes/ReleaseNotes-2.6.txt
+++ b/ReleaseNotes/ReleaseNotes-2.6.txt
@@ -3,7 +3,7 @@ Release notes for Gerrit 2.6
 
 Gerrit 2.6 is now available:
 
-link:https://gerrit-releases.commondatastorage.googleapis.com/gerrit-2.6.war[https://gerrit-releases.commondatastorage.googleapis.com/gerrit-2.6.war]
+link:https://gerrit-releases.storage.googleapis.com/gerrit-2.6.war[https://gerrit-releases.storage.googleapis.com/gerrit-2.6.war]
 
 Gerrit 2.6 includes the bug fixes done with
 link:ReleaseNotes-2.5.1.html[Gerrit 2.5.1],
diff --git a/gerrit-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/gerrit-plugin-archetype/src/main/resources/archetype-resources/pom.xml
index 92099faa77..2b8dfb2f04 100644
--- a/gerrit-plugin-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/gerrit-plugin-archetype/src/main/resources/archetype-resources/pom.xml
@@ -94,9 +94,9 @@ limitations under the License.
     <repository>
       <id>gerrit-api-repository</id>
 #if ($gerritApiVersion.endsWith("SNAPSHOT"))
-      <url>https://gerrit-api.commondatastorage.googleapis.com/snapshot/</url>
+      <url>https://gerrit-api.storage.googleapis.com/snapshot/</url>
 #else
-      <url>https://gerrit-api.commondatastorage.googleapis.com/release/</url>
+      <url>https://gerrit-api.storage.googleapis.com/release/</url>
 #end
     </repository>
   </repositories>
diff --git a/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/pom.xml b/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/pom.xml
index 6e1ba210f0..ddfdac0e5b 100644
--- a/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/pom.xml
@@ -120,9 +120,9 @@ limitations under the License.
     <repository>
       <id>gerrit-api-repository</id>
 #if ($gerritApiVersion.endsWith("SNAPSHOT"))
-      <url>https://gerrit-api.commondatastorage.googleapis.com/snapshot/</url>
+      <url>https://gerrit-api.storage.googleapis.com/snapshot/</url>
 #else
-      <url>https://gerrit-api.commondatastorage.googleapis.com/release/</url>
+      <url>https://gerrit-api.storage.googleapis.com/release/</url>
 #end
     </repository>
   </repositories>
diff --git a/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/pom.xml b/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/pom.xml
index 2a8b469aa0..814fc5e0f0 100644
--- a/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/gerrit-plugin-js-archetype/src/main/resources/archetype-resources/pom.xml
@@ -112,9 +112,9 @@ limitations under the License.
     <repository>
       <id>gerrit-api-repository</id>
 #if ($gerritApiVersion.endsWith("SNAPSHOT"))
-      <url>https://gerrit-api.commondatastorage.googleapis.com/snapshot/</url>
+      <url>https://gerrit-api.storage.googleapis.com/snapshot/</url>
 #else
-      <url>https://gerrit-api.commondatastorage.googleapis.com/release/</url>
+      <url>https://gerrit-api.storage.googleapis.com/release/</url>
 #end
     </repository>
   </repositories>
diff --git a/tools/download_file.py b/tools/download_file.py
index 5fbdb1743a..87d5c2d6c4 100755
--- a/tools/download_file.py
+++ b/tools/download_file.py
@@ -24,7 +24,7 @@ from sys import stderr
 from zipfile import ZipFile, BadZipfile, LargeZipFile
 
 REPO_ROOTS = {
-  'GERRIT': 'http://gerrit-maven.commondatastorage.googleapis.com',
+  'GERRIT': 'http://gerrit-maven.storage.googleapis.com',
   'MAVEN_CENTRAL': 'http://repo1.maven.org/maven2',
 }