diff --git a/tools/maven/BUCK b/tools/maven/BUCK
index 0a470a4b29..7a35ce6cd9 100644
--- a/tools/maven/BUCK
+++ b/tools/maven/BUCK
@@ -5,7 +5,7 @@ TYPE = 'snapshot' if GERRIT_VERSION.endswith('-SNAPSHOT') else 'release'
 
 maven_package(
   repository = 'gerrit-api-repository',
-  url = 's3://gerrit-api@commondatastorage.googleapis.com/%s' % TYPE,
+  url = 'gs://gerrit-api/%s' % TYPE,
   version = GERRIT_VERSION,
   jar = {
     'gerrit-extension-api': '//:extension-api',
diff --git a/tools/maven/fake_pom.xml b/tools/maven/fake_pom.xml
index d066a4a97c..e4b565c2c9 100644
--- a/tools/maven/fake_pom.xml
+++ b/tools/maven/fake_pom.xml
@@ -3,4 +3,21 @@
   <groupId>com.google.gerrit</groupId>
   <artifactId>Gerrit-Code-Review-Maven</artifactId>
   <version>1</version>
+  <distributionManagement>
+    <repository>
+      <id>gerrit-api-repository</id>
+      <name>Gerrit API Repository</name>
+      <url>gs://gerrit-api</url>
+      <uniqueVersion>true</uniqueVersion>
+    </repository>
+  </distributionManagement>
+  <build>
+    <extensions>
+      <extension>
+        <groupId>com.googlesource.gerrit</groupId>
+        <artifactId>gs-maven-wagon</artifactId>
+        <version>3.3</version>
+      </extension>
+    </extensions>
+  </build>
 </project>