diff --git a/images/baremetal/Dockerfile.ci b/images/baremetal/Dockerfile.ci
index 8fc266c2315..c515e733b77 100644
--- a/images/baremetal/Dockerfile.ci
+++ b/images/baremetal/Dockerfile.ci
@@ -10,10 +10,8 @@ RUN TAGS="libvirt baremetal" hack/build.sh
 FROM registry.svc.ci.openshift.org/origin/4.1:base
 COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
 
-RUN yum install --setopt=tsflags=nodocs -y \
-    yum update -y && \
-    yum install --setopt=tsflags=nodocs -y \
-    libvirt-libs && \
+RUN yum update -y && \
+    yum install --setopt=tsflags=nodocs -y libvirt-libs && \
     yum clean all && rm -rf /var/cache/yum/*
 
 RUN mkdir /output && chown 1000:1000 /output
diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci
index 382fbc59c1d..b33944647fd 100644
--- a/images/installer/Dockerfile.upi.ci
+++ b/images/installer/Dockerfile.upi.ci
@@ -16,15 +16,12 @@ COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install
 COPY --from=builder /go/src/github.com/openshift/installer/upi /var/lib/openshift-install/upi
 COPY --from=builder /go/src/github.com/openshift/installer/data/data/rhcos.json /var/lib/openshift-install/rhcos.json
 
-## epel-release is required for jq
-## gettext is required for envsubst
 RUN yum install --setopt=tsflags=nodocs -y \
-    epel-release \
     gettext \
     openssh-clients && \
     yum update -y && \
     yum install --setopt=tsflags=nodocs -y \
-    unzip gzip jq awscli util-linux && \
+    unzip gzip jq util-linux && \
     yum clean all && rm -rf /var/cache/yum/*
 
 ENV TERRAFORM_VERSION=0.11.11
diff --git a/images/nested-libvirt/Dockerfile b/images/nested-libvirt/Dockerfile
index dbadc54a243..e03ac1cdc0b 100644
--- a/images/nested-libvirt/Dockerfile
+++ b/images/nested-libvirt/Dockerfile
@@ -11,7 +11,6 @@ COPY --from=builder /go/src/github.com/openshift/installer/images/nested-libvirt
 COPY --from=builder /go/src/github.com/openshift/installer/images/nested-libvirt/mock-nss.sh /bin/mock-nss.sh
 
 RUN yum install -y \
-    epel-release \
     gettext \
     google-cloud-sdk \
     openssh-clients \
diff --git a/images/openstack/Dockerfile.ci b/images/openstack/Dockerfile.ci
index f4c9f1d0006..415fa738514 100644
--- a/images/openstack/Dockerfile.ci
+++ b/images/openstack/Dockerfile.ci
@@ -11,9 +11,7 @@ COPY --from=builder /go/src/github.com/openshift/installer/images/openstack/rdo-
 COPY --from=builder /go/src/github.com/openshift/installer/images/openstack/rdo-stein.gpg /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
 COPY --from=registry.svc.ci.openshift.org/origin/4.1:cli /usr/bin/oc /bin/oc
 
-RUN yum install --setopt=tsflags=nodocs -y \
-    https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm &&\
-    yum update -y && \
+RUN yum update -y && \
     yum install --setopt=tsflags=nodocs -y \
     python-openstackclient && \
     yum clean all && rm -rf /var/cache/yum/*