diff --git a/docker/CI/container-script.sh b/docker/CI/container-script.sh
index 61d46ee1444ee744f6db10962d8ebd90f8af5ebf..d3fb305f6f49ee38c9c1e13c17a5c47b3c31c24c 100755
--- a/docker/CI/container-script.sh
+++ b/docker/CI/container-script.sh
@@ -3,6 +3,6 @@
 cd /opt/ftl
 mkdir build
 cd build
-cmake .. -DCMAKE_CXX_FLAGS="-fdiagnostics-color" -DWITH_OPTFLOW=TRUE -DUSE_CPPCHECK=FALSE -DBUILD_CALIBRATION=TRUE -DWITH_CERES=TRUE -DCMAKE_BUILD_TYPE=Release -DCPACK_GENERATOR=DEB &&
-make -j4 &&
+cmake .. -GNinja -DCMAKE_CXX_FLAGS="-fdiagnostics-color" -DWITH_OPTFLOW=TRUE -DUSE_CPPCHECK=FALSE -DBUILD_CALIBRATION=TRUE -DWITH_CERES=TRUE -DCMAKE_BUILD_TYPE=Release -DCPACK_GENERATOR=DEB &&
+ninja &&
 ctest --output-on-failure
diff --git a/docker/CI/pipeline-script.sh b/docker/CI/pipeline-script.sh
index 1fe21694edbbbf7cb4a392078344cd480f9d7d46..11125248ce233c42ad3d34fc8655d893ccb1bc29 100755
--- a/docker/CI/pipeline-script.sh
+++ b/docker/CI/pipeline-script.sh
@@ -7,6 +7,6 @@ docker run \
     -e NVIDIA_DRIVER_CAPABILITIES=graphics,compute,utility,video \
     -v "${PWD}:/opt/ftl" \
     -u $(id -u ${USER}):$(id -g ${USER}) \
-    ftlab/base:1.0-dev \
+    ftlab/base:1.1-dev \
     /opt/ftl/docker/CI/container-script.sh
     
\ No newline at end of file
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 9f4775d8bbdfa61a551339891123fd784a5ea59b..59d4da30225fade8cc72874bb040b67643d08219 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update &&\
     # Install build tools, build dependencies and python
     apt-get install --no-install-recommends -y \
         build-essential \
-        cmake \
+        ninja-build \
         git \
         openssh-client \
         wget \
@@ -51,6 +51,11 @@ RUN apt-get update &&\
 COPY ./libnvcuvid.so ./libnvidia-encode.so /usr/lib/x86_64-linux-gnu/
 
 RUN cd /opt/ &&\
+    # CMake
+    wget https://github.com/Kitware/CMake/releases/download/v3.20.5/cmake-3.20.5-linux-x86_64.sh && \
+    chmod a+x ././cmake-3.20.5-linux-x86_64.sh && \
+    ./cmake-3.20.5-linux-x86_64.sh --skip-license --prefix=/usr/local && \
+    rm ./cmake-3.20.5-linux-x86_64.sh && \
     # Pylon
     wget -O pylon.deb https://seafile.utu.fi/f/b4585f6c84f0462fac04/?dl=1 &&\
     apt-get install ./pylon.deb &&\
diff --git a/docker/devel/Dockerfile b/docker/devel/Dockerfile
index 3e8f447023805b1c0d0e71ed0230ccd2fad0eb62..9ead9074da96f7722f29088617131b261700630d 100644
--- a/docker/devel/Dockerfile
+++ b/docker/devel/Dockerfile
@@ -1,4 +1,4 @@
-FROM ftlab/base:1.0-dev
+FROM ftlab/base:1.1-dev
 
 ARG USER_ID
 ARG GROUP_ID