diff --git a/Jenkinsfile b/Jenkinsfile
index 4257dbd73f0b7188cad56ab21129b3e4da373e73..1f1c65273a5ed6301cdf6c083fb67704f9e8c65b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,7 +26,7 @@ def buildImage(architecture, type, board, debosarguments = "", sysroot = false,
     node("docker-slave") {
       checkout scm
       docker.withRegistry('https://docker-registry.apertis.org') {
-        buildenv = docker.image("docker-registry.apertis.org/apertis/apertis-image-builder")
+        buildenv = docker.image("docker-registry.apertis.org/apertis/apertis-${release}-image-builder")
         /* Pull explicitely to ensure we have the latest */
         buildenv.pull()
 
@@ -130,18 +130,6 @@ def buildImage(architecture, type, board, debosarguments = "", sysroot = false,
  * non-official onces can be in e.g. playground/ */
 def production = env.JOB_NAME.startsWith("apertis-")
 
-if (production) {
-  node("docker-slave") {
-    checkout scm
-    stage("Image builder docker") {
-      docker.withRegistry('https://auth.docker-registry.apertis.org', 'apertis-docker') {
-        d = docker.build("auth.docker-registry.apertis.org/apertis/apertis-image-builder", "apertis-image-builder")
-        d.push()
-      }
-    }
-  }
-}
-
 def images = [:]
 
 images["Sdk"] = buildImage("amd64", "sdk", "sdk",
diff --git a/apertis-image-builder/Dockerfile b/apertis-image-builder/Dockerfile
deleted file mode 100644
index 47656a66ecae97aeb4e9458a074c8db78ad3c7cb..0000000000000000000000000000000000000000
--- a/apertis-image-builder/Dockerfile
+++ /dev/null
@@ -1,61 +0,0 @@
-FROM debian:stretch-slim
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-ENV HOME=/recipes
-ENV GOPATH=/usr/local/go
-ENV PATH=$PATH:/usr/local/go/bin
-
-# Always install procps in case the docker file gets used in jenkins
-RUN apt update && apt-get install  --no-install-recommends -y procps
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends apt-transport-https \
-                                               ca-certificates
-
-RUN mkdir -p /etc/apt/sources.list.d
-COPY apertis-tools.list /etc/apt/sources.list.d
-RUN mkdir -p /etc/apt/trusted.gpg.d/
-COPY collabora-obs-archive-keyring.gpg /etc/apt/trusted.gpg.d
-
-RUN mkdir -p /etc/apt/preferences.d
-COPY parted-apertis /etc/apt/preferences.d
-
-# Bits needed to run fakemachine
-RUN apt-get update  && \
-    apt-get install --no-install-recommends -y qemu-system-x86 \
-                                               busybox \
-                                               linux-image-amd64 \
-                                               systemd \
-                                               dbus
-
-# Bits needed to build debos
-RUN apt-get update  && \
-    apt-get install --no-install-recommends -y golang-go \
-                                               git \
-                                               libostree-dev \
-                                               gcc \
-                                               libc6-dev \
-                                               pkg-config
-
-# Bits to build the image
-RUN apt-get update  && \
-    apt-get install --no-install-recommends -y parted \
-                                               btrfs-progs \
-                                               e2fsprogs \
-                                               dosfstools \
-                                               qemu-user-static \
-                                               binfmt-support \
-                                               python3 \
-                                               bmap-tools \
-                                               rsync \
-                                               systemd-container \
-                                               openssh-client \
-                                               debootstrap \
-                                               libnss-wrapper \
-                                               ostree \
-                                               qemu-utils
-
-# build debos
-RUN go get github.com/go-debos/debos/cmd/debos && \
-    go install github.com/go-debos/debos/cmd/debos
diff --git a/apertis-image-builder/apertis-tools.list b/apertis-image-builder/apertis-tools.list
deleted file mode 100644
index 4390141d6f1545d16611f2da12b0965dd745695e..0000000000000000000000000000000000000000
--- a/apertis-image-builder/apertis-tools.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb https://repositories.apertis.org/debian/ stretch tools
-
diff --git a/apertis-image-builder/collabora-obs-archive-keyring.gpg b/apertis-image-builder/collabora-obs-archive-keyring.gpg
deleted file mode 100644
index 83a4359a737b47843e5da193251e294139817a28..0000000000000000000000000000000000000000
Binary files a/apertis-image-builder/collabora-obs-archive-keyring.gpg and /dev/null differ
diff --git a/apertis-image-builder/parted-apertis b/apertis-image-builder/parted-apertis
deleted file mode 100644
index 3898b80d1b9923132ea6a6d4e0653362f387291e..0000000000000000000000000000000000000000
--- a/apertis-image-builder/parted-apertis
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: parted
-Pin: release o=Apertis
-Pin-Priority: 1000