diff --git a/scripts/bmc-template/bmc-template.sh b/scripts/bmc-template/bmc-template.sh
index de81a900f..a00ff88c3 100755
--- a/scripts/bmc-template/bmc-template.sh
+++ b/scripts/bmc-template/bmc-template.sh
@@ -2,9 +2,8 @@
 
 # taken from openstack-virtual-baremetal/bin/install_openstackbmc.sh
 yum -y update centos-release # required for rdo-release install to work
-yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
-yum install -y python-pip python2-crypto os-net-config python-novaclient python-neutronclient git jq
+yum install -y python-pip python-crypto os-net-config python-novaclient python-neutronclient git jq
 pip install pyghmi
 
 # the CI cloud is using a unsafe disk caching mode, so this sync will be ignored by the host
diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh
index a0dc4c64b..90fe54685 100755
--- a/scripts/common_functions.sh
+++ b/scripts/common_functions.sh
@@ -297,7 +297,7 @@ function layer_ci_repo {
 
 
 function echo_vars_to_deploy_env {
-    for VAR in CENTOS_MIRROR EPEL_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 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 PINGTEST_TEMPLATE; do
+    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 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 PINGTEST_TEMPLATE; do
         echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
     done
 }
diff --git a/scripts/deploy-server.sh b/scripts/deploy-server.sh
index a6fb60a0a..95c4f01f9 100644
--- a/scripts/deploy-server.sh
+++ b/scripts/deploy-server.sh
@@ -4,7 +4,6 @@
 # to run based on the hostname e.g. to create a mirror server then one can simply
 # nova boot --image <id> --flavor <id> --user-data scripts/deploy-server.sh --nic net-id=<id> --nic net-id=<id>,v4-fixed-ip=192.168.1.101 mirror-server
 
-yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 yum install -y puppet git
 
 echo puppetlabs-apache adrien-filemapper | xargs -n 1 puppet module install
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index f125dc0ce..7b40063be 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -11,7 +11,6 @@ source $TRIPLEO_ROOT/tripleo-ci/scripts/metrics.bash
 export PYTHONUNBUFFERED=true
 
 export DIB_DISTRIBUTION_MIRROR=$CENTOS_MIRROR
-export DIB_EPEL_MIRROR=$EPEL_MIRROR
 export STABLE_RELEASE=${STABLE_RELEASE:-""}
 
 
diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh
index 8e99e7468..536e763bf 100755
--- a/scripts/tripleo.sh
+++ b/scripts/tripleo.sh
@@ -286,6 +286,11 @@ EOF"
     # takes precedence over the main RDO repositories.
     sudo yum -y install yum-plugin-priorities
 
+    # Make sure EPEL is uninstalled.
+    if rpm --quiet -q epel-release; then
+        sudo rpm -e epel-release
+    fi
+
     log "Repository setup - DONE."
 
 }
diff --git a/toci_instack.sh b/toci_instack.sh
index 9981705e9..e6198c762 100755
--- a/toci_instack.sh
+++ b/toci_instack.sh
@@ -81,7 +81,6 @@ ls /home/jenkins/.ssh/id_rsa_virt_power || ssh-keygen -f /home/jenkins/.ssh/id_r
 export ANSWERSFILE=/usr/share/instack-undercloud/undercloud.conf.sample
 export ELEMENTS_PATH=/usr/share/instack-undercloud
 export DIB_DISTRIBUTION_MIRROR=$CENTOS_MIRROR
-export DIB_EPEL_MIRROR=$EPEL_MIRROR
 export DIB_CLOUD_IMAGES=http://$MIRRORSERVER/cloud.centos.org/centos/7/images
 
 source $TRIPLEO_ROOT/tripleo-ci/deploy.env