diff --git a/Makefile b/Makefile
index 879fe7a896d0e116ff6ce9084e67e6b222347300..43c6e3758e96b706f1fc0258908590524f82a228 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
 all:
+	$(MAKE) -C wheezy
 	$(MAKE) -C jessie
+	$(MAKE) -C stretch
 
 push:
+	$(MAKE) -C wheezy push
 	$(MAKE) -C jessie push
+	$(MAKE) -C stretch push
diff --git a/stretch/Makefile b/stretch/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..c306097a532b5ad62559d4b65c760fe29f5b4fb3
--- /dev/null
+++ b/stretch/Makefile
@@ -0,0 +1,7 @@
+all:
+	$(MAKE) -C x86_64
+	$(MAKE) -C x86
+
+push:
+	$(MAKE) -C x86_64 push
+	$(MAKE) -C x86 push
diff --git a/stretch/x86/Dockerfile b/stretch/x86/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..0bdaa5db6f9475d11b75b98f1fcfe021e9154c0b
--- /dev/null
+++ b/stretch/x86/Dockerfile
@@ -0,0 +1,17 @@
+FROM i386/debian:stretch
+
+RUN apt update \
+ && apt upgrade -y
+
+RUN apt-get install -y \
+  sudo wget curl tar expect git \
+  devscripts build-essential lintian ccache pbuilder aptitude
+
+RUN groupadd -g 1000 jenkins \
+ && useradd -u 1000 -g 1000 -m jenkins \
+ && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
+ && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
+
+RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
+ && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \
+ && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
diff --git a/stretch/x86/Makefile b/stretch/x86/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..15497f28d78567a8e18e399400d9e251ae31c60b
--- /dev/null
+++ b/stretch/x86/Makefile
@@ -0,0 +1 @@
+include ../../image.mk
diff --git a/stretch/x86_64/Dockerfile b/stretch/x86_64/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..5c4a576dcbe178989b3fee60848ad6fcca7a5f5b
--- /dev/null
+++ b/stretch/x86_64/Dockerfile
@@ -0,0 +1,17 @@
+FROM debian:stretch
+
+RUN apt update \
+ && apt upgrade -y
+
+RUN apt-get install -y \
+  sudo wget curl tar expect git \
+  devscripts build-essential lintian ccache pbuilder aptitude
+
+RUN groupadd -g 1000 jenkins \
+ && useradd -u 1000 -g 1000 -m jenkins \
+ && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
+ && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
+
+RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
+ && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \
+ && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
diff --git a/stretch/x86_64/Makefile b/stretch/x86_64/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..15497f28d78567a8e18e399400d9e251ae31c60b
--- /dev/null
+++ b/stretch/x86_64/Makefile
@@ -0,0 +1 @@
+include ../../image.mk
diff --git a/wheezy/Makefile b/wheezy/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..c306097a532b5ad62559d4b65c760fe29f5b4fb3
--- /dev/null
+++ b/wheezy/Makefile
@@ -0,0 +1,7 @@
+all:
+	$(MAKE) -C x86_64
+	$(MAKE) -C x86
+
+push:
+	$(MAKE) -C x86_64 push
+	$(MAKE) -C x86 push
diff --git a/wheezy/x86/Dockerfile b/wheezy/x86/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..01ae39c4d9238147e000f829bb0fadf1a4246935
--- /dev/null
+++ b/wheezy/x86/Dockerfile
@@ -0,0 +1,17 @@
+FROM i386/debian:jessie
+
+RUN apt update \
+ && apt upgrade -y
+
+RUN apt-get install -y \
+  sudo wget curl tar expect git \
+  devscripts build-essential lintian ccache pbuilder aptitude
+
+RUN groupadd -g 1000 jenkins \
+ && useradd -u 1000 -g 1000 -m jenkins \
+ && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
+ && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
+
+RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
+ && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \
+ && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
diff --git a/wheezy/x86/Makefile b/wheezy/x86/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..15497f28d78567a8e18e399400d9e251ae31c60b
--- /dev/null
+++ b/wheezy/x86/Makefile
@@ -0,0 +1 @@
+include ../../image.mk
diff --git a/wheezy/x86_64/Dockerfile b/wheezy/x86_64/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..241c751a2ebcc7af1ea50d04e8052415e28a987d
--- /dev/null
+++ b/wheezy/x86_64/Dockerfile
@@ -0,0 +1,17 @@
+FROM debian:jessie
+
+RUN apt update \
+ && apt upgrade -y
+
+RUN apt-get install -y \
+  sudo wget curl tar expect git \
+  devscripts build-essential lintian ccache pbuilder aptitude
+
+RUN groupadd -g 1000 jenkins \
+ && useradd -u 1000 -g 1000 -m jenkins \
+ && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
+ && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
+
+RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
+ && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \
+ && echo "deb http://packages.icinga.com/debian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
diff --git a/wheezy/x86_64/Makefile b/wheezy/x86_64/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..15497f28d78567a8e18e399400d9e251ae31c60b
--- /dev/null
+++ b/wheezy/x86_64/Makefile
@@ -0,0 +1 @@
+include ../../image.mk