diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 207e88803f34196165ef6684a49b13f9dda6fe06..6cf3122827b1f33cd6c3f627f80243b23f3bc0bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,11 @@ image: docker
 build:
   stage: build
   script:
-    - docker image build -t registry.git.rwth-aachen.de/acplt/rte-tools/rte-build-docker-image/image .
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker push registry.git.rwth-aachen.de/acplt/rte-tools/rte-build-docker-image/image
+    - docker image build -t registry.git.rwth-aachen.de/acplt/build-docker-image/build-essential build-essential
+    - docker image build -t registry.git.rwth-aachen.de/acplt/build-docker-image/rte-build rte-build
+    - docker image build -t registry.git.rwth-aachen.de/acplt/build-docker-image/rte-crossbuild rte-crossbuild
+    - docker push registry.git.rwth-aachen.de/acplt/build-docker-image/build-essential
+    - docker push registry.git.rwth-aachen.de/acplt/build-docker-image/rte-build
+    - docker push registry.git.rwth-aachen.de/acplt/build-docker-image/rte-crossbuild
     - docker logout $CI_REGISTRY
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 3dc55aa25859496cd7819af288344059705acfd4..0000000000000000000000000000000000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM ubuntu:19.04
-
-RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime && apt-get update -qq && apt-get install -y -qq --no-install-recommends gcc libc6-dev make git ca-certificates bison flex tcl cmake gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64
diff --git a/build-essential/Dockerfile b/build-essential/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..e9fc48cac05574b7186d40289f42266caba7e0cc
--- /dev/null
+++ b/build-essential/Dockerfile
@@ -0,0 +1,4 @@
+FROM ubuntu:19.04
+
+RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends gcc g++ libc-dev make cmake git ca-certificates && rm -rf /var/lib/apt/lists/*
diff --git a/rte-build/Dockerfile b/rte-build/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..d735cf0b2a74dc129e2ecd610801645e837995fe
--- /dev/null
+++ b/rte-build/Dockerfile
@@ -0,0 +1,3 @@
+FROM registry.git.rwth-aachen.de/acplt/build-docker-image/build-essential
+
+RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends bison flex tcl && rm -rf /var/lib/apt/lists/*
diff --git a/rte-crossbuild/Dockerfile b/rte-crossbuild/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..45ccdcc2372de3f3bf3baa33dc88727b73b25b05
--- /dev/null
+++ b/rte-crossbuild/Dockerfile
@@ -0,0 +1,3 @@
+FROM registry.git.rwth-aachen.de/acplt/build-docker-image/rte-build
+
+RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64 && rm -rf /var/lib/apt/lists/*