diff --git a/kolla/common/config.py b/kolla/common/config.py
index 2c8eb8e005..3bcbc2b195 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -27,9 +27,8 @@ DISTRO_RELEASE = {
     'debian': '8',
     'ubuntu': '16.04',
 }
-DELOREAN = ("https://buildlogs.centos.org/centos/7/cloud/x86_64/"
-            "rdo-trunk-master-tested/delorean.repo")
-# TODO(pbourke): update to buildlogs.centos.org once this moves
+DELOREAN = \
+    "https://trunk.rdoproject.org/centos7/current-passed-ci/delorean.repo"
 DELOREAN_DEPS = "https://trunk.rdoproject.org/centos7/delorean-deps.repo"
 INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']
 
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 0d07b7ea14..6939f257ab 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -7,10 +7,7 @@ set -o errexit
 export PYTHONUNBUFFERED=1
 
 source /etc/nodepool/provider
-
-NODEPOOL_MIRROR_HOST=${NODEPOOL_MIRROR_HOST:-mirror.$NODEPOOL_REGION.$NODEPOOL_CLOUD.openstack.org}
-NODEPOOL_MIRROR_HOST=$(echo $NODEPOOL_MIRROR_HOST|tr '[:upper:]' '[:lower:]')
-NODEPOOL_PYPI_MIRROR=${NODEPOOL_PYPI_MIRROR:-http://$NODEPOOL_MIRROR_HOST/pypi/simple}
+source /etc/ci/mirror_info.sh
 
 # Just for mandre :)
 if [[ ! -f /etc/sudoers.d/jenkins ]]; then
@@ -56,7 +53,9 @@ RUN sed -i -e "/^mirrorlist/d" \
         -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://$NODEPOOL_MIRROR_HOST|" \
         /etc/yum.repos.d/epel.repo \
     && sed -i -e "s|^baseurl=http://mirror.centos.org|baseurl=http://$NODEPOOL_MIRROR_HOST|" \
-        /etc/yum.repos.d/CentOS-Ceph-Jewel.repo
+        /etc/yum.repos.d/CentOS-Ceph-Jewel.repo \
+    && sed -i -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=$NODEPOOL_RDO_PROXY|" \
+        /etc/yum.repos.d/delorean.repo
 
 {% elif base_distro == "oracle" %}
 
@@ -67,7 +66,9 @@ RUN sed -i -e "/^mirrorlist/d" \
         -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://$NODEPOOL_MIRROR_HOST|" \
         /etc/yum.repos.d/epel.repo \
     && sed -i -e "s|^baseurl=http://mirror.centos.org|baseurl=http://$NODEPOOL_MIRROR_HOST|" \
-        /etc/yum.repos.d/CentOS-Ceph-Hammer.repo
+        /etc/yum.repos.d/CentOS-Ceph-Hammer.repo \
+    && sed -i -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=$NODEPOOL_RDO_PROXY|" \
+        /etc/yum.repos.d/delorean.repo
 
 {% elif base_distro == "ubuntu" %}