diff --git a/rpm/Makefile b/rpm/Makefile
index 9b1bbf5f36..2f329dcd96 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -40,7 +40,7 @@ RUN?=docker run --rm \
 	rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
 
 FEDORA_RELEASES := fedora-31 fedora-30 fedora-29
-CENTOS_RELEASES := centos-7
+CENTOS_RELEASES := centos-7 centos-8
 DISTROS := $(FEDORA_RELEASES) $(CENTOS_RELEASES)
 
 .PHONY: help
diff --git a/rpm/centos-7/Dockerfile b/rpm/centos-7/Dockerfile
index 2ea8306370..ea0406ca8e 100644
--- a/rpm/centos-7/Dockerfile
+++ b/rpm/centos-7/Dockerfile
@@ -19,8 +19,6 @@ ENV DISTRO=${DISTRO}
 ENV SUITE=${SUITE}
 RUN yum install -y rpm-build rpmlint
 COPY SPECS /root/rpmbuild/SPECS
-# Overwrite repo that was failing on aarch64
-RUN sed -i 's/altarch/centos/g' /etc/yum.repos.d/CentOS-Sources.repo
 RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec
 COPY --from=golang /usr/local/go /usr/local/go
 WORKDIR /root/rpmbuild
diff --git a/rpm/centos-8/Dockerfile b/rpm/centos-8/Dockerfile
new file mode 100644
index 0000000000..3153d168d0
--- /dev/null
+++ b/rpm/centos-8/Dockerfile
@@ -0,0 +1,25 @@
+ARG GO_IMAGE
+ARG DISTRO=centos
+ARG SUITE=8
+ARG BUILD_IMAGE=${DISTRO}:${SUITE}
+
+FROM ${GO_IMAGE} AS golang
+
+FROM ${BUILD_IMAGE}
+ENV GOPROXY=direct
+ENV GO111MODULE=off
+ENV GOPATH=/go
+ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
+ENV AUTO_GOPATH 1
+ENV DOCKER_BUILDTAGS seccomp selinux
+ENV RUNC_BUILDTAGS seccomp selinux
+ARG DISTRO
+ARG SUITE
+ENV DISTRO=${DISTRO}
+ENV SUITE=${SUITE}
+RUN yum install -y rpm-build rpmlint
+COPY SPECS /root/rpmbuild/SPECS
+RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec
+COPY --from=golang /usr/local/go /usr/local/go
+WORKDIR /root/rpmbuild
+ENTRYPOINT ["/bin/rpmbuild"]