diff --git a/manifests/site.pp b/manifests/site.pp
index 5a78bfba9f..78d9f6df12 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -252,7 +252,7 @@ node "review.openstack.org" {
                          remote => 'https://gerrit.googlesource.com/gerrit'
                          } ],
     logo => 'openstack.png',
-    war => 'http://ci.openstack.org/tarballs/gerrit-2.4.1-10-g63110fd.war',
+    war => 'http://tarballs.openstack.org/ci/gerrit-2.4.1-10-g63110fd.war',
     script_user => 'launchpadsync',
     script_key_file => '/home/gerrit2/.ssh/launchpadsync_rsa',
     script_site => 'openstack',
@@ -279,7 +279,7 @@ node "gerrit-dev.openstack.org", "review-dev.openstack.org" {
                          close_pull => 'true'
                          } ],
     logo => 'openstack.png',
-    war => 'http://ci.openstack.org/tarballs/gerrit-2.4.1-10-g63110fd.war',
+    war => 'http://tarballs.openstack.org/ci/gerrit-2.4.1-10-g63110fd.war',
     script_user => 'update',
     script_key_file => '/home/gerrit2/.ssh/id_rsa',
     script_site => 'openstack',
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index c16085f40e..412d1ff67b 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -33,16 +33,16 @@
 #     Note that only the final component is used for comparing to the most
 #     recently installed WAR.  In other words, if you update the war from:
 #
-#       http://ci.openstack.org/tarballs/gerrit.war
+#       http://tarballs.openstack.org/ci/gerrit.war
 #     to:
 #       http://somewhereelse.example.com/gerrit.war
 #
 #     Gerrit won't be updated unless you delete gerrit.war from
 #     ~gerrit2/gerrit-wars.  But if you change the URL from:
 #
-#       http://ci.openstack.org/tarballs/gerrit-2.2.2.war
+#       http://tarballs.openstack.org/ci/gerrit-2.2.2.war
 #     to:
-#       http://ci.openstack.org/tarballs/gerrit-2.3.0.war
+#       http://tarballs.openstack.org/ci/gerrit-2.3.0.war
 #     Gerrit will be upgraded on the next puppet run.
 
 # TODO: move closing github pull requests to another module
@@ -493,7 +493,7 @@ class gerrit($virtual_hostname='',
 
   # Install Gerrit itself.
 
-  # The Gerrit WAR is specified as a url like 'http://ci.openstack.org/tarballs/gerrit-2.2.2-363-gd0a67ce.war'
+  # The Gerrit WAR is specified as a url like 'http://tarballs.openstack.org/ci/gerrit-2.2.2-363-gd0a67ce.war'
   # Set $basewar so that we can work with filenames like gerrit-2.2.2-363-gd0a67ce.war'.
 
   if $war =~ /.*\/(.*)/ {