diff --git a/.gitreview b/.gitreview
index 34f26320..1e7d9014 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=openstack-ci/devstack-gate.git
+project=openstack-infra/devstack-gate.git
diff --git a/README.md b/README.md
index 54fdec60..6025d2b4 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ devstack, and then runs the devstack-vm-update-image.py script. It
 boots a new VM from the provider's base image, installs some basic
 packages (build-essential, python-dev, etc) including java so that the
 machine can run the Jenkins slave agent, runs puppet to set up the
-basic system configuration for Jenkins slaves in the openstack-ci
+basic system configuration for Jenkins slaves in the openstack-infra
 project, and then caches all of the debian and pip packages and test
 images specified in the devstack repository, and clones the OpenStack
 project repositories. It then takes a snapshot image of that machine
@@ -198,8 +198,8 @@ managed in source code repositories just like the code of OpenStack
 itself. If you'd like to contribute, just clone and propose a patch to
 the relevant repository:
 
-    https://github.com/openstack-ci/devstack-gate
-    https://github.com/openstack/openstack-ci-puppet
+    https://github.com/openstack-infra/devstack-gate
+    https://github.com/openstack/openstack-infra-puppet
 
 You can file bugs on the openstack-ci project:
 
@@ -222,7 +222,7 @@ you're working as is called "jenkins"):
     export ZUUL_PROJECT=testing
 
     cd /home/jenkins/workspace
-    git clone https://github.com/openstack-ci/devstack-gate
+    git clone https://github.com/openstack-infra/devstack-gate
     cd devstack-gate
     python vmdatabase.py
     sqlite3 /home/jenkins/vm.db
diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 65359d54..60cfc29c 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -56,7 +56,7 @@ export DEVSTACK_GATE_TEMPEST_FULL=${DEVSTACK_GATE_TEMPEST_FULL:-0}
 # Normally not set, and we do include devstack-gate with the rest of
 # the projects.
 if [ -z "$SKIP_DEVSTACK_GATE_PROJECT" ]; then
-    PROJECTS="openstack-ci/devstack-gate $PROJECTS"
+    PROJECTS="openstack-infra/devstack-gate $PROJECTS"
 fi
 
 export BASE=/opt/stack
@@ -111,7 +111,7 @@ function setup_workspace {
       SHORT_PROJECT=`basename $PROJECT`
       if [[ ! -e $SHORT_PROJECT ]]; then
         echo "  Need to clone $SHORT_PROJECT"
-        git clone https://review.openstack.org/p/$PROJECT
+        git clone http://zuul.openstack.org/p/$PROJECT
       fi
       cd $SHORT_PROJECT
 
@@ -144,7 +144,7 @@ function setup_workspace {
 
       # See if Zuul prepared a ref for this project
       if [ "$ZUUL_REF" != "" ] && \
-          git fetch https://review.openstack.org/p/$PROJECT $ZUUL_REF; then
+          git fetch http://zuul.openstack.org/p/$PROJECT $ZUUL_REF; then
         # It's there, so check it out.
         git checkout FETCH_HEAD
         git reset --hard FETCH_HEAD
@@ -283,7 +283,7 @@ GATE_SCRIPT_DIR=$BASE/new/devstack-gate
 
 # Also, if we're testing devstack-gate, re-exec this script once so
 # that we can test the new version of it.
-if [[ $ZUUL_PROJECT == "openstack-ci/devstack-gate" ]] && [[ $RE_EXEC != "true" ]]; then
+if [[ $ZUUL_PROJECT == "openstack-infra/devstack-gate" ]] && [[ $RE_EXEC != "true" ]]; then
     export RE_EXEC="true"
     echo "This build includes a change to the devstack gate; re-execing this script."
     exec $GATE_SCRIPT_DIR/devstack-vm-gate-wrap.sh
diff --git a/devstack-vm-update-image.py b/devstack-vm-update-image.py
index bd39e73e..ed21dde5 100755
--- a/devstack-vm-update-image.py
+++ b/devstack-vm-update-image.py
@@ -60,7 +60,7 @@ PROJECTS = ['openstack/nova',
             'openstack/python-openstackclient',
             'openstack/python-quantumclient',
             'openstack-dev/devstack',
-            'openstack-ci/devstack-gate']
+            'openstack-infra/devstack-gate']
 
 
 def run_local(cmd, status=False, cwd='.', env={}):
@@ -166,8 +166,7 @@ def bootstrap_server(provider, server, admin_pass, key):
         raise Exception("Unable to log in via SSH")
 
     # hpcloud can't reliably set the hostname
-    gerrit_url = 'https://review.openstack.org/p/openstack/' \
-                 'openstack-ci-puppet.git'
+    gerrit_url = 'https://review.openstack.org/p/openstack-infra/config.git'
     client.ssh("set hostname", "sudo hostname %s" % server.name)
     client.ssh("get puppet repo deb",
                "sudo /usr/bin/wget "
@@ -184,11 +183,11 @@ def bootstrap_server(provider, server, admin_pass, key):
                '--option "Dpkg::Options::=--force-confold"'
                ' --assume-yes install git puppet')
     client.ssh("clone puppret repo",
-               "sudo git clone %s /root/openstack-ci-puppet" % gerrit_url)
+               "sudo git clone %s /root/config" % gerrit_url)
     client.ssh("install puppet modules",
-               "sudo /bin/bash /root/openstack-ci-puppet/install_modules.sh")
+               "sudo /bin/bash /root/config/install_modules.sh")
     client.ssh("run puppet",
-               "sudo puppet apply --modulepath=/root/openstack-ci-puppet/modules:"
+               "sudo puppet apply --modulepath=/root/config/modules:"
                "/etc/puppet/modules "
                '-e "%s"' % PUPPET_CLASS)
 
diff --git a/setup.py b/setup.py
index e1c641a7..5fa6f4ac 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ setuptools.setup(
     name="devstack-gate",
     version="2012.2",
     description="Devstack gate scripts used by Openstack CI team",
-    url='https://github.com/openstack-ci/devstack-gate',
+    url='https://github.com/openstack-infra/devstack-gate',
     license='Apache',
     author='Openstack CI team',
     author_email='openstack@lists.launchpad.net',