diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index 73a217b3dd..ff922da102 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -41,6 +41,7 @@ RUN sed -i -e  "/^mirrorlist/d" \
         -e "/^metalink/d" \
         -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|g" \
         -e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
+        -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
         -e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \
         -e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \
         -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \
diff --git a/tox.ini b/tox.ini
index 6e6e33551d..8912223c7f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
           OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT
           PYTHON OS_TEST_PATH LISTOPT IDOPTION
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   find . -type d -name "__pycache__" -delete
   python setup.py test --slowest --testr-args='{posargs}'
 
@@ -72,7 +72,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.BuildTestCentosBinary
   {toxinidir}/tools/dump_info.sh
@@ -83,7 +83,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.BuildTestCentosSource
   {toxinidir}/tools/dump_info.sh
@@ -94,7 +94,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.BuildTestUbuntuBinary
   {toxinidir}/tools/dump_info.sh
@@ -105,7 +105,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.BuildTestUbuntuSource
   {toxinidir}/tools/dump_info.sh
@@ -116,7 +116,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.BuildTestDebianBinary
   {toxinidir}/tools/dump_info.sh
@@ -127,7 +127,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.BuildTestDebianSource
   {toxinidir}/tools/dump_info.sh
@@ -138,7 +138,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.BuildTestOracleLinuxBinary
   {toxinidir}/tools/dump_info.sh
@@ -149,7 +149,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.BuildTestOracleLinuxSource
   {toxinidir}/tools/dump_info.sh
@@ -160,7 +160,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestCentosBinary
   {toxinidir}/tools/deploy_aio.sh centos binary
@@ -172,7 +172,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestCentosSource
   {toxinidir}/tools/deploy_aio.sh centos source
@@ -184,7 +184,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestOracleLinuxBinary
   {toxinidir}/tools/deploy_aio.sh oraclelinux binary
@@ -196,7 +196,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestOracleLinuxSource
   {toxinidir}/tools/deploy_aio.sh oraclelinux source
@@ -208,7 +208,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestUbuntuBinary
   {toxinidir}/tools/deploy_aio.sh ubuntu binary
@@ -220,7 +220,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.DeployTestUbuntuSource
   {toxinidir}/tools/deploy_aio.sh ubuntu source
@@ -232,7 +232,7 @@ whitelist_externals = find
 setenv =
   DOCKER_BUILD_TEST=1
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
   testr run test_build.BuildTestUbuntuSource
   {toxinidir}/tools/dump_info.sh