diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d3ba52..c2be9bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,6 +61,8 @@ ubuntu:summerschool:
   <<: *build_definition
 ubuntu:18.04:
   <<: *build_definition
+ubuntu:wo-dependencies:
+  <<: *build_definition
 clang:6.0:
   <<: *build_definition
 cuda:8.0:
diff --git a/docker/rocm/Dockerfile-latest b/docker/rocm/Dockerfile-latest
index a291b80..9b30792 100644
--- a/docker/rocm/Dockerfile-latest
+++ b/docker/rocm/Dockerfile-latest
@@ -8,13 +8,11 @@ RUN apt-get update && apt-get install -y \
     curl \
     pkg-config \
     openmpi-bin libopenmpi-dev \
-    lcov \
     libfftw3-dev \
     libboost-dev libboost-serialization-dev libboost-mpi-dev libboost-filesystem-dev libboost-test-dev \
     libgsl-dev \
     cython python python-numpy python-h5py python-enum \
     lcov \
-    curl \
     git \
     pep8 pylint \
     python-vtk \
@@ -24,7 +22,6 @@ RUN apt-get update && apt-get install -y \
     libhdf5-10:amd64 \
     vim \
     ccache \
-    rocfft \
     rocrand \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/*
@@ -34,8 +31,7 @@ RUN cd /tmp \
  && cp -r Thrust-6e31840ed4ac5e158e485c5cc22558a601a86ae8/thrust /opt/rocm/include/ \
  && rm -r Thrust-6e31840ed4ac5e158e485c5cc22558a601a86ae8
 
-RUN apt-get remove -y rocfft \
- && cd /tmp \
+RUN cd /tmp \
  && git clone -b r2c https://github.com/mkuron/rocFFT.git \
  && cd rocFFT \
  && mkdir build && cd build \
diff --git a/docker/ubuntu/Dockerfile-wo-dependencies b/docker/ubuntu/Dockerfile-wo-dependencies
new file mode 100644
index 0000000..cf097e4
--- /dev/null
+++ b/docker/ubuntu/Dockerfile-wo-dependencies
@@ -0,0 +1,23 @@
+FROM ubuntu:bionic
+MAINTAINER Florian Weik <fweik@icp.uni-stuttgart.de>
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get install -y \
+    apt-utils \
+    cmake \
+    build-essential \
+    openmpi-bin libopenmpi-dev \
+    libboost-dev libboost-serialization-dev libboost-mpi-dev libboost-filesystem-dev libboost-test-dev \
+    cython python python-numpy python-h5py python-enum34 \
+    curl \
+    git \
+    pycodestyle pylint \
+    python-vtk6 \
+    python-pyface \
+    vim \
+    ccache \
+&& apt-get clean \
+&& rm -rf /var/lib/apt/lists/*
+
+RUN useradd -m espresso
+USER espresso
+WORKDIR /home/espresso