diff --git a/configure_facts.sh b/configure_facts.sh
index c5980f157..a0095bc40 100644
--- a/configure_facts.sh
+++ b/configure_facts.sh
@@ -30,30 +30,17 @@ source $SCRIPT_DIR/functions
 if [ -f /etc/ci/mirror_info.sh ]; then
     source /etc/ci/mirror_info.sh
 
-    if [ "${OS_NAME_VERS}" == "centos9" ]; then
-        CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}/centos-stream"
-    else
-        CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}"
-    fi
-
+    CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}/centos-stream"
     DEPS_MIRROR_HOST="${NODEPOOL_RDO_PROXY}/${DLRN_DEPS_BASE}/"
     if uses_debs; then
         CEPH_MIRROR_HOST="http://download.ceph.com/debian-${CEPH_VERSION}"
         NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs"
     else
-        if [ "${OS_NAME_VERS}" == "centos9" ]; then
-            CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/SIGs/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
-        else
-            CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
-        fi
+        CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/SIGs/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
         NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs"
     fi
 else
-    if [ "${OS_NAME_VERS}" == "centos9" ]; then
-        CENTOS_MIRROR_HOST='http://mirror.stream.centos.org'
-    else
-        CENTOS_MIRROR_HOST='http://mirror.centos.org'
-    fi
+    CENTOS_MIRROR_HOST='http://mirror.stream.centos.org'
     DEPS_MIRROR_HOST="https://trunk.rdoproject.org/${DLRN_DEPS_BASE}/"
     NODEPOOL_RDO_PROXY='https://trunk.rdoproject.org'
     NODEPOOL_UCA_MIRROR='http://ubuntu-cloud.archive.canonical.com/ubuntu'
@@ -61,11 +48,7 @@ else
         CEPH_MIRROR_HOST="https://download.ceph.com/debian-${CEPH_VERSION}"
         NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com'
     else
-        if [ "${OS_NAME_VERS}" == "centos9" ]; then
-            CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/SIGs/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
-        else
-            CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
-        fi
+        CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/SIGs/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
         NODEPOOL_PUPPETLABS_MIRROR="https://yum.puppetlabs.com"
     fi
 fi
diff --git a/run_tests.sh b/run_tests.sh
index 3af559b4a..c5c153ff0 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -18,7 +18,7 @@ source ${SCRIPT_DIR}/functions
 
 export WORKSPACE=${WORKSPACE:-/tmp}
 export CEPH_VERSION=${CEPH_VERSION:-pacific}
-export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-5}
+export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-6}
 export SCENARIO=${SCENARIO:-scenario001}
 export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}
 export MANAGE_REPOS=${MANAGE_REPOS:-true}