diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 949fa8130be313b6ff40e62ef659c8d9a64fb3df..df7203d059fd7fa0dc3942763c65720577875ee1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,9 +24,6 @@ groovy:
 focal:
   <<: *build_job
 
-eoan:
-  <<: *build_job
-
 disco:
   <<: *build_job
 
diff --git a/Makefile b/Makefile
index 7259a8a02730f2d0824295f696c521e31502669a..3d33a5a950018a899a6864468469a539206a10b2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TARGETS := trusty xenial bionic disco eoan focal
+TARGETS := trusty xenial bionic disco focal
 TARGETS_PUSH := $(TARGETS:=-push)
 TARGETS_CLEAN := $(TARGETS:=-clean)
 
diff --git a/eoan/Makefile b/eoan/Makefile
deleted file mode 100644
index 5575b7277a605ae7414bb26db324fb38dbb2f465..0000000000000000000000000000000000000000
--- a/eoan/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../dist.mk
diff --git a/eoan/x86/Dockerfile b/eoan/x86/Dockerfile
deleted file mode 100644
index 3f7d179e91d155bdccbedf3a1a818f7dea139624..0000000000000000000000000000000000000000
--- a/eoan/x86/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM i386/ubuntu:eoan
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
- && apt-get install -y eatmydata \
- && eatmydata apt-get upgrade -y
-
-RUN eatmydata apt-get install -y \
-  sudo wget curl tar expect git \
-  devscripts build-essential lintian ccache pbuilder aptitude apt-utils
-
-RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
- && DIST="$(lsb_release -sc)" \
- && echo "deb http://packages.icinga.com/ubuntu icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
-
-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/eoan/x86/Makefile b/eoan/x86/Makefile
deleted file mode 100644
index 15497f28d78567a8e18e399400d9e251ae31c60b..0000000000000000000000000000000000000000
--- a/eoan/x86/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../../image.mk
diff --git a/eoan/x86_64/Dockerfile b/eoan/x86_64/Dockerfile
deleted file mode 100644
index 9ab8cdd6690b2d0b294b84e7c1f1f04e17e47895..0000000000000000000000000000000000000000
--- a/eoan/x86_64/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:eoan
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
- && apt-get install -y eatmydata \
- && eatmydata apt-get upgrade -y
-
-RUN eatmydata apt-get install -y \
-  sudo wget curl tar expect git \
-  devscripts build-essential lintian ccache pbuilder aptitude apt-utils
-
-RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
- && DIST="$(lsb_release -sc)" \
- && echo "deb http://packages.icinga.com/ubuntu icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
-
-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/eoan/x86_64/Makefile b/eoan/x86_64/Makefile
deleted file mode 100644
index 15497f28d78567a8e18e399400d9e251ae31c60b..0000000000000000000000000000000000000000
--- a/eoan/x86_64/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../../image.mk