diff --git a/cmake/ci/Makefile b/cmake/ci/Makefile
index f655fc3..3dc4d96 100644
--- a/cmake/ci/Makefile
+++ b/cmake/ci/Makefile
@@ -155,7 +155,8 @@ TOOLCHAIN_TARGETS = \
  arm-linux-gnueabihf armv8l-linux-gnueabihf arm-linux-gnueabi armeb-linux-gnueabihf armeb-linux-gnueabi \
  aarch64-linux-gnu aarch64_be-linux-gnu \
  mips32 mips32el mips64 mips64el \
- ppc ppc64 ppc64le \
+ ppc ppc-440fp ppc-e500mc \
+ ppc64 ppc64le \
  riscv32 riscv64 \
  s390x
 TOOLCHAIN_STAGES = env devel build test
diff --git a/cmake/ci/docker/toolchain/Dockerfile b/cmake/ci/docker/toolchain/Dockerfile
index 7970f18..a77cfe3 100644
--- a/cmake/ci/docker/toolchain/Dockerfile
+++ b/cmake/ci/docker/toolchain/Dockerfile
@@ -5,25 +5,22 @@ LABEL maintainer="corentinl@google.com"
 # Install system build dependencies
 ENV PATH=/usr/local/bin:$PATH
 RUN apt-get update -qq \
-&& DEBIAN_FRONTEND=noninteractive apt-get install -yq git wget libssl-dev build-essential \
- ninja-build python3 python3-venv pkgconf libglib2.0-dev \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -yq \
+ git wget libssl-dev \
+ build-essential cmake ninja-build \
+ python3 python3-venv \
+ pkgconf libglib2.0-dev \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 ENTRYPOINT ["/usr/bin/bash", "-c"]
 CMD ["/usr/bin/bash"]
 
-# Install CMake 3.21.3
-RUN wget "https://cmake.org/files/v3.21/cmake-3.21.3-linux-x86_64.sh" \
-&& chmod a+x cmake-3.21.3-linux-x86_64.sh \
-&& ./cmake-3.21.3-linux-x86_64.sh --prefix=/usr/local/ --skip-license \
-&& rm cmake-3.21.3-linux-x86_64.sh
-
 FROM env AS devel
 WORKDIR /home/project
 COPY . .
 
 ARG TARGET
-ENV TARGET ${TARGET:-unknown}
+ENV TARGET=${TARGET:-unknown}
 
 FROM devel AS build
 RUN cmake -version