diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04
index 5e12f448..4a0982b4 100644
--- a/scripts/Dockerfile-ubuntu_18_04
+++ b/scripts/Dockerfile-ubuntu_18_04
@@ -3,12 +3,14 @@ FROM ubuntu:18.04 AS sunshine-ubuntu_18_04
 ARG DEBIAN_FRONTEND=noninteractive 
 ARG TZ="Europe/London"
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends software-properties-common && \
     add-apt-repository ppa:ubuntu-toolchain-r/test && \
     apt-get update -y && \
     apt-get install -y \
         build-essential \
+        cmake \
         gcc-10 \
         git \
         g++-10 \
@@ -34,13 +36,6 @@ RUN apt-get update -y && \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1.tar.gz && \
-    tar -zxvf cmake-3.22.1.tar.gz && \
-    cd cmake-3.22.1 && \
-    ./bootstrap && \
-    make && \
-    make install
-
 RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10
 
 RUN wget https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run --progress=bar:force:noscroll -q --show-progress -O /root/cuda.run && chmod a+x /root/cuda.run