diff --git a/ci/docker_images/ubuntu/xenial/Dockerfile b/ci/docker_images/ubuntu/xenial/Dockerfile
index dc21be2fabd7356a816e066c0ce0cb2d65ff4048..daae74853c3eb048429373184b588165381b06f7 100644
--- a/ci/docker_images/ubuntu/xenial/Dockerfile
+++ b/ci/docker_images/ubuntu/xenial/Dockerfile
@@ -40,6 +40,7 @@ RUN apt-get install -y python-dev
 RUN apt-get install -y python-pip
 RUN apt-get install -y python-scitools
 RUN apt-get install -y opencl-headers
+RUN apt-get install -y ocl-icd-opencl-dev
 
 # python packages
 RUN pip install --upgrade pip
@@ -57,16 +58,18 @@ RUN pip install h5py
 RUN pip install gmpy2
 RUN pip install psutil
 RUN pip install py-cpuinfo
+RUN pip install Mako
 
 # pyopencl
 RUN cd /tmp                                      \
 && git clone https://github.com/inducer/pyopencl \
+&& cd pyopencl                                   \
 && git submodule update --init                   \
-&& ./configure                                   \
+&& ./configure.py                                \
 && make                                          \
 && make install                                  \
 && cd -                                          \
-&& rm -Rf /tmp/pyopencl                          \
+&& rm -Rf /tmp/pyopencl
 
 # patchelf
 RUN cd /tmp                                     \
@@ -107,5 +110,6 @@ RUN echo 'deb http://downloads.skewed.de/apt/xenial xenial universe'     >> /etc
 # clean cached packages
 RUN rm -rf /var/lib/apt/lists/*
 RUN rm -rf $HOME/.cache/pip/*
+RUN rm -rf /tmp/*
 
 CMD ["/bin/bash"]
diff --git a/ci/docker_images/ubuntu/zesty/Dockerfile b/ci/docker_images/ubuntu/zesty/Dockerfile
index 7ee6978b2120da656d274d4ec99a8a9b5f1a76cb..501321cf88fb7a005f98dc609dea1b4ceda369b3 100644
--- a/ci/docker_images/ubuntu/zesty/Dockerfile
+++ b/ci/docker_images/ubuntu/zesty/Dockerfile
@@ -80,6 +80,7 @@ RUN echo 'deb http://apt.llvm.org/zesty/ llvm-toolchain-zesty main'     >> /etc/
  && echo 'deb-src http://apt.llvm.org/zesty/ llvm-toolchain-zesty main' >> /etc/apt/sources.list \
  && apt-get update                                                                               \
  && apt-get install --assume-yes --allow-unauthenticated clang-6.0 libclang-6.0-dev
+
 # oclgrind
 RUN cd /tmp                                       \
  && git clone https://github.com/jrprice/Oclgrind \
@@ -102,5 +103,6 @@ RUN echo 'deb http://downloads.skewed.de/apt/zesty zesty universe'     >> /etc/a
 # clean cached packages
 RUN rm -rf /var/lib/apt/lists/*
 RUN rm -rf $HOME/.cache/pip/*
+RUN rm -rf /tmp/*
 
 CMD ["/bin/bash"]