diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh
index ce4b7bb51..7f35a6b97 100755
--- a/scripts/common_functions.sh
+++ b/scripts/common_functions.sh
@@ -361,7 +361,7 @@ function layer_ci_repo {
 function echo_vars_to_deploy_env {
     CALLER=$(caller)
     echo "# Written via echo_vars_to_deploy_env from $CALLER" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
-    for VAR in CENTOS_MIRROR http_proxy INTROSPECT MY_IP no_proxy NODECOUNT OVERCLOUD_DEPLOY_ARGS OVERCLOUD_UPDATE_ARGS PACEMAKER SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TRIPLEO_SH_ARGS NETISO_V4 NETISO_V6 TOCI_JOBTYPE UNDERCLOUD_SSL UNDERCLOUD_HEAT_CONVERGENCE RUN_TEMPEST_TESTS RUN_PING_TEST JOB_NAME OVB UNDERCLOUD_IDEMPOTENT MULTINODE CONTROLLER_HOSTS COMPUTE_HOSTS SUBNODES_SSH_KEY TEST_OVERCLOUD_DELETE OVERCLOUD OSINFRA UNDERCLOUD_SANITY_CHECK OVERCLOUD_PINGTEST_ARGS FEATURE_BRANCH OVERCLOUD_ROLES UPGRADE_RELEASE OVERCLOUD_MAJOR_UPGRADE MAJOR_UPGRADE UNDERCLOUD_MAJOR_UPGRADE CA_SERVER UNDERCLOUD_TELEMETRY UNDERCLOUD_UI UNDERCLOUD_VALIDATIONS PREDICTABLE_PLACEMENT OPSTOOLS_REPO_ENABLED UPGRADE_ENV UNDERCLOUD_CONTAINERS BOOTSTRAP_SUBNODES_MINIMAL MULTINODE_ENV_PATH; do
+    for VAR in NODEPOOL_CENTOS_MIRROR http_proxy INTROSPECT MY_IP no_proxy NODECOUNT OVERCLOUD_DEPLOY_ARGS OVERCLOUD_UPDATE_ARGS PACEMAKER SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TRIPLEO_SH_ARGS NETISO_V4 NETISO_V6 TOCI_JOBTYPE UNDERCLOUD_SSL UNDERCLOUD_HEAT_CONVERGENCE RUN_TEMPEST_TESTS RUN_PING_TEST JOB_NAME OVB UNDERCLOUD_IDEMPOTENT MULTINODE CONTROLLER_HOSTS COMPUTE_HOSTS SUBNODES_SSH_KEY TEST_OVERCLOUD_DELETE OVERCLOUD OSINFRA UNDERCLOUD_SANITY_CHECK OVERCLOUD_PINGTEST_ARGS FEATURE_BRANCH OVERCLOUD_ROLES UPGRADE_RELEASE OVERCLOUD_MAJOR_UPGRADE MAJOR_UPGRADE UNDERCLOUD_MAJOR_UPGRADE CA_SERVER UNDERCLOUD_TELEMETRY UNDERCLOUD_UI UNDERCLOUD_VALIDATIONS PREDICTABLE_PLACEMENT OPSTOOLS_REPO_ENABLED UPGRADE_ENV UNDERCLOUD_CONTAINERS BOOTSTRAP_SUBNODES_MINIMAL MULTINODE_ENV_PATH; do
         echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
     done
     for role in $OVERCLOUD_ROLES; do
@@ -374,7 +374,7 @@ function echo_vars_to_deploy_env {
 function echo_vars_to_deploy_env_oooq {
     CALLER=$(caller)
     echo "# Written via echo_vars_to_deploy_env from $CALLER" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
-    for VAR in CENTOS_MIRROR http_proxy MY_IP no_proxy NODECOUNT SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TOCI_JOBTYPE JOB_NAME SUBNODES_SSH_KEY FEATURE_BRANCH BOOTSTRAP_SUBNODES_MINIMAL; do
+    for VAR in NODEPOOL_CENTOS_MIRROR http_proxy MY_IP no_proxy NODECOUNT SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TOCI_JOBTYPE JOB_NAME SUBNODES_SSH_KEY FEATURE_BRANCH BOOTSTRAP_SUBNODES_MINIMAL; do
         echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
     done
     # TODO(gcerami) uncomment this code if 3nodes jobs are implemented before the bootstrap role
diff --git a/scripts/common_vars.bash b/scripts/common_vars.bash
index fc4ec55f5..b56d4673e 100644
--- a/scripts/common_vars.bash
+++ b/scripts/common_vars.bash
@@ -43,7 +43,6 @@ export UNDERCLOUD_VM_NAME=instack
 
 export REMAINING_TIME=${REMAINING_TIME:-180}
 export NODEPOOL_DOCKER_REGISTRY_PROXY=${NODEPOOL_DOCKER_REGISTRY_PROXY:-""}
-export CENTOS_MIRROR=${CENTOS_MIRROR:-""}
 
 # post ci chores to run at the end of ci
 SSH_OPTIONS='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=Verbose -o PasswordAuthentication=no -o ConnectionAttempts=32'
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 9b1b0a047..5b52d799c 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -11,7 +11,7 @@ source $TRIPLEO_ROOT/tripleo-ci/scripts/common_functions.sh
 # Prevent python from buffering stdout, so timestamps are set at appropriate times
 export PYTHONUNBUFFERED=true
 
-export DIB_DISTRIBUTION_MIRROR=$CENTOS_MIRROR
+export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_CENTOS_MIRROR
 export STABLE_RELEASE=${STABLE_RELEASE:-""}
 
 # the TLS everywhere job requires the undercloud to have a domain set so it can
diff --git a/toci_gate_test-oooq.sh b/toci_gate_test-oooq.sh
index 8fa5f5d1c..d95d243e0 100755
--- a/toci_gate_test-oooq.sh
+++ b/toci_gate_test-oooq.sh
@@ -27,12 +27,6 @@ if [ -f /etc/nodepool/provider ] ; then
     # source variables common across all the scripts.
     source /etc/ci/mirror_info.sh
 
-    # set up distribution mirrors in openstack
-    NODEPOOL_MIRROR_HOST=${NODEPOOL_MIRROR_HOST:-mirror.$NODEPOOL_REGION.$NODEPOOL_CLOUD.openstack.org}
-    NODEPOOL_MIRROR_HOST=$(echo $NODEPOOL_MIRROR_HOST|tr '[:upper:]' '[:lower:]')
-    export CENTOS_MIRROR=http://$NODEPOOL_MIRROR_HOST/centos
-    export EPEL_MIRROR=http://$NODEPOOL_MIRROR_HOST/epel
-
     # host setup
     export RHCLOUD=''
     if [ ${NODEPOOL_CLOUD:-''} == 'tripleo-test-cloud-rh1' ]; then
diff --git a/toci_gate_test-orig.sh b/toci_gate_test-orig.sh
index af41ec524..23bf249ec 100755
--- a/toci_gate_test-orig.sh
+++ b/toci_gate_test-orig.sh
@@ -7,10 +7,6 @@ export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
 [ -f /etc/ci/mirror_info.sh ] && source /etc/ci/mirror_info.sh
 
 source $(dirname $0)/scripts/common_vars.bash
-NODEPOOL_MIRROR_HOST=${NODEPOOL_MIRROR_HOST:-mirror.$NODEPOOL_REGION.$NODEPOOL_CLOUD.openstack.org}
-NODEPOOL_MIRROR_HOST=$(echo $NODEPOOL_MIRROR_HOST|tr '[:upper:]' '[:lower:]')
-export CENTOS_MIRROR=http://$NODEPOOL_MIRROR_HOST/centos
-export EPEL_MIRROR=http://$NODEPOOL_MIRROR_HOST/epel
 export START_JOB_TIME=$(date +%s)
 
 if [ $NODEPOOL_CLOUD == 'tripleo-test-cloud-rh1' ]; then