diff --git a/Dockerfile.rh7 b/Dockerfile.rh7
index db2c091..cf6505f 100644
--- a/Dockerfile.rh7
+++ b/Dockerfile.rh7
@@ -9,6 +9,10 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/rpm
 
 ENV RPMBUILD_BASE_DIR=/drone/src
 
+RUN yum install -q -y \
+    epel-release \
+    yum-utils && \
+    rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
 RUN yum install -q -y \
     dash \
     ca-certificates \
@@ -38,9 +42,7 @@ RUN yum install -q -y \
     pkgconfig \
     wget curl \
     automake autoconf \
-    yum-utils rpm-build rpmdevtools \
-    epel-release && \
-    rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+    rpm-build rpmdevtools \
     yum clean all
 
 ADD overlay/ /
diff --git a/Dockerfile.rh8 b/Dockerfile.rh8
index e578309..b291d81 100644
--- a/Dockerfile.rh8
+++ b/Dockerfile.rh8
@@ -9,7 +9,12 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/rpm
 
 ENV RPMBUILD_BASE_DIR=/drone/src
 
-RUN yum install -q -y \
+RUN dnf install -q -y \
+    epel-release \
+    dnf-utils dnf-plugins-core && \
+    rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+    dnf config-manager --set-enabled powertools
+RUN dnf install -q -y \
     dash \
     ca-certificates \
     gcc gcc-c++ \
@@ -30,7 +35,7 @@ RUN yum install -q -y \
     gperf \
     nasm \
     perl \
-    python \
+    python3 \
     yasm \
     which \
     libva-devel \
@@ -38,10 +43,8 @@ RUN yum install -q -y \
     pkgconfig \
     wget curl \
     automake autoconf \
-    yum-utils rpm-build rpmdevtools \
-    epel-release && \
-    rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 && \
-    yum clean all
+    rpm-build rpmdevtools \
+    dnf clean all
 
 ADD overlay/ /