diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7511108e5712b59d8fb73cd55deff7a8e026501..877f39a1ba64b2200b6aed61f4cb0f18948ab9c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,8 +18,5 @@ 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
deleted file mode 100644
index 4600acdf8d098028466d578b8a6710ac70a94718..0000000000000000000000000000000000000000
--- a/8/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-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 \
-  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
-
-
-RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
-RUN icinga-provide-go
-USER build
-ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
-CMD ["icinga-build-package"]
diff --git a/8/Makefile b/8/Makefile
deleted file mode 100644
index f451fe153997996b75db9be5b1b9b967fad97fc4..0000000000000000000000000000000000000000
--- a/8/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-VARIANT := x86_64
-include ../image.mk
diff --git a/Makefile b/Makefile
index 6b31ee2fde9b6003a7ebe50a974759007416f449..d7def5f963685665607178358f6a553a7488504f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
 all:
 	$(MAKE) -C 7
-	$(MAKE) -C 8
 
 push:
 	$(MAKE) -C 7 push
-	$(MAKE) -C 8 push