diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f6e8fb7cdd4d9ab6897915bb4146685b67bc08f..1463f250e2dc97e07475f150b856908b23c43f58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,8 +30,5 @@ groovy:
 focal:
   <<: *build_job
 
-disco:
-  <<: *build_job
-
 bionic:
   <<: *build_job
diff --git a/Makefile b/Makefile
index 4945eee5f7bc63d4196294541abb69a6187e2ac3..4654553e1cc64c07cb0595caebdf1e1c89691423 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TARGETS := bionic disco focal hirsute impish
+TARGETS := bionic focal hirsute impish
 TARGETS_PUSH := $(TARGETS:=-push)
 TARGETS_CLEAN := $(TARGETS:=-clean)
 
diff --git a/disco/Makefile b/disco/Makefile
deleted file mode 100644
index 5575b7277a605ae7414bb26db324fb38dbb2f465..0000000000000000000000000000000000000000
--- a/disco/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../dist.mk
diff --git a/disco/x86/Dockerfile b/disco/x86/Dockerfile
deleted file mode 100644
index 31b946511610b8a22d93cff8e426249089b306bb..0000000000000000000000000000000000000000
--- a/disco/x86/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM i386/ubuntu:disco
-
-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/disco/x86/Makefile b/disco/x86/Makefile
deleted file mode 100644
index 15497f28d78567a8e18e399400d9e251ae31c60b..0000000000000000000000000000000000000000
--- a/disco/x86/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../../image.mk
diff --git a/disco/x86_64/Dockerfile b/disco/x86_64/Dockerfile
deleted file mode 100644
index cb0e611bc2210d82ab51e3a7434d24d7edf8572b..0000000000000000000000000000000000000000
--- a/disco/x86_64/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:disco
-
-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/disco/x86_64/Makefile b/disco/x86_64/Makefile
deleted file mode 100644
index 15497f28d78567a8e18e399400d9e251ae31c60b..0000000000000000000000000000000000000000
--- a/disco/x86_64/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../../image.mk