diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23f0c6aa634af13f647c6f87b974e0c7ddfc0e20..3259741569117e4e458c6b60a427512b5b66ad19 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'
 
+eoan:
+  <<: *build_job
+
 disco:
   <<: *build_job
 
diff --git a/Makefile b/Makefile
index 7fd9e304f66d085743dccd65d864c700cede472f..aa07d2a8c0254ae0bfd0fa67502734ddae3028a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TARGETS := trusty xenial bionic disco
+TARGETS := trusty xenial bionic disco eoan
 TARGETS_PUSH := $(TARGETS:=-push)
 TARGETS_CLEAN := $(TARGETS:=-clean)
 
diff --git a/eoan/Makefile b/eoan/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..5575b7277a605ae7414bb26db324fb38dbb2f465
--- /dev/null
+++ b/eoan/Makefile
@@ -0,0 +1 @@
+include ../dist.mk
diff --git a/eoan/x86/Dockerfile b/eoan/x86/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..3f7d179e91d155bdccbedf3a1a818f7dea139624
--- /dev/null
+++ b/eoan/x86/Dockerfile
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 0000000000000000000000000000000000000000..15497f28d78567a8e18e399400d9e251ae31c60b
--- /dev/null
+++ b/eoan/x86/Makefile
@@ -0,0 +1 @@
+include ../../image.mk
diff --git a/eoan/x86_64/Dockerfile b/eoan/x86_64/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..9ab8cdd6690b2d0b294b84e7c1f1f04e17e47895
--- /dev/null
+++ b/eoan/x86_64/Dockerfile
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 0000000000000000000000000000000000000000..15497f28d78567a8e18e399400d9e251ae31c60b
--- /dev/null
+++ b/eoan/x86_64/Makefile
@@ -0,0 +1 @@
+include ../../image.mk