diff --git a/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps b/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps
index 7b69c4f1..3a391e3e 100644
--- a/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps
+++ b/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps
@@ -1,2 +1,3 @@
 base
+epel
 openstack-ci-mirrors
diff --git a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
index 30428653..22734afa 100755
--- a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
+++ b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
@@ -41,4 +41,5 @@ DIB_EPEL_MIRROR=${DIB_EPEL_MIRROR:-}
 [ -n "$DIB_EPEL_MIRROR" ] || exit 0
 
 # Set the EPEL mirror to use
-sed -e "s|^#baseurl=http://download.fedoraproject.org/pub/epel|baseurl=$DIB_EPEL_MIRROR|;/^mirrorlist=/d" -i /etc/yum.repos.d/epel.repo
+sed -e "s|^#baseurl=http://download.fedoraproject.org/pub/epel|baseurl=$DIB_EPEL_MIRROR|;/^mirrorlist=/d;/^metalink=/d" -i /etc/yum.repos.d/epel.repo
+