diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65f09525d85953bc4d1b850eebb99b01d2b15dab..00e228bc5368c0285f190e90cfa22b480d63ece9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,9 @@ before_script:
     - make -C ${CI_JOB_NAME}
     - '[ "$CI_COMMIT_REF_NAME" != master ] || make -C ${CI_JOB_NAME} push'
 
+'8':
+  <<: *build_job
+
 '7':
   <<: *build_job
 
diff --git a/8/Dockerfile b/8/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..0c5efeb5a93d5c835ed17053779704e05ce19417
--- /dev/null
+++ b/8/Dockerfile
@@ -0,0 +1,38 @@
+FROM centos:8
+
+RUN dnf update -y && dnf clean all
+
+RUN dnf install -y \
+  sudo wget curl which tar expect git \
+  patch rpm-build redhat-rpm-config rpmlint \
+  patch make util-linux \
+  dnf-utils rpmdevtools createrepo \
+  epel-release \
+ && dnf clean all
+
+RUN dnf config-manager --set-enabled PowerTools
+
+RUN dnf install -y \
+  boost-devel \
+  bison \
+  cmake \
+  openssl-devel \
+  mysql-devel \
+  libedit-devel \
+  ccache \
+  gcc gcc-c++ \
+ && dnf clean all
+
+RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
+ https://packages.icinga.com/epel/ICINGA-release.repo
+
+RUN groupadd -g 1000 build \
+ && useradd -u 1000 -g 1000 -m build \
+ && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
+ && chown build.build /usr/local/bin
+
+USER build
+RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
+ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
+CMD ["icinga-build-package"]
diff --git a/8/Makefile b/8/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..f451fe153997996b75db9be5b1b9b967fad97fc4
--- /dev/null
+++ b/8/Makefile
@@ -0,0 +1,2 @@
+VARIANT := x86_64
+include ../image.mk
diff --git a/Makefile b/Makefile
index 15ffd3646d7d9400d3d8b8759ad65b32f307134b..aad908b83745383bee1de67812e3683a5edbcdef 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,9 @@ all:
 	$(MAKE) -C 6
 	$(MAKE) -C 6-i386
 	$(MAKE) -C 7
+	$(MAKE) -C 8
 
 push:
 	$(MAKE) -C 6-i386 push
 	$(MAKE) -C 6 push
-	$(MAKE) -C 7 push
+	$(MAKE) -C 8 push