diff --git a/docker/ubuntu/22.04/base-clang-10/Dockerfile b/docker/ubuntu/22.04/base-clang-10/Dockerfile
index b2d61ec6b..5610b90a2 100644
--- a/docker/ubuntu/22.04/base-clang-10/Dockerfile
+++ b/docker/ubuntu/22.04/base-clang-10/Dockerfile
@@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-base
 ENV CC clang-10
 ENV CXX clang++-10
 
-RUN apt-get update \
-   && apt-get install --no-install-recommends -y clang-10 llvm-10-dev \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y clang-10 llvm-10-dev \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
 
diff --git a/docker/ubuntu/22.04/base-clang-11/Dockerfile b/docker/ubuntu/22.04/base-clang-11/Dockerfile
index 4cea74478..5e4f947b2 100644
--- a/docker/ubuntu/22.04/base-clang-11/Dockerfile
+++ b/docker/ubuntu/22.04/base-clang-11/Dockerfile
@@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-base
 ENV CC clang-11
 ENV CXX clang++-11
 
-RUN apt-get update \
-   && apt-get install --no-install-recommends -y clang-11 llvm-11-dev \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y clang-11 llvm-11-dev \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
 
diff --git a/docker/ubuntu/22.04/base-clang-12/Dockerfile b/docker/ubuntu/22.04/base-clang-12/Dockerfile
index 2563037ad..187d722b6 100644
--- a/docker/ubuntu/22.04/base-clang-12/Dockerfile
+++ b/docker/ubuntu/22.04/base-clang-12/Dockerfile
@@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-base
 ENV CC clang-12
 ENV CXX clang++-12
 
-RUN apt-get update \
-   && apt-get install --no-install-recommends -y clang-12 llvm-12-dev \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y clang-12 llvm-12-dev \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
 
diff --git a/docker/ubuntu/22.04/base-clang-13/Dockerfile b/docker/ubuntu/22.04/base-clang-13/Dockerfile
index 8b000a440..c8e7f3630 100644
--- a/docker/ubuntu/22.04/base-clang-13/Dockerfile
+++ b/docker/ubuntu/22.04/base-clang-13/Dockerfile
@@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-base
 ENV CC clang-13
 ENV CXX clang++-13
 
-RUN apt-get update \
-   && apt-get install --no-install-recommends -y clang-13 llvm-13-dev \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y clang-13 llvm-13-dev \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
 
diff --git a/docker/ubuntu/22.04/base-clang-14/Dockerfile b/docker/ubuntu/22.04/base-clang-14/Dockerfile
index 12c474ca8..8781a9ee3 100644
--- a/docker/ubuntu/22.04/base-clang-14/Dockerfile
+++ b/docker/ubuntu/22.04/base-clang-14/Dockerfile
@@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-base
 ENV CC clang-14
 ENV CXX clang++-14
 
-RUN apt-get update \
-   && apt-get install --no-install-recommends -y clang-14 llvm-14-dev \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y clang-14 llvm-14-dev \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
 
diff --git a/docker/ubuntu/22.04/base-gcc-10/Dockerfile b/docker/ubuntu/22.04/base-gcc-10/Dockerfile
index 49db991f8..324d380cf 100644
--- a/docker/ubuntu/22.04/base-gcc-10/Dockerfile
+++ b/docker/ubuntu/22.04/base-gcc-10/Dockerfile
@@ -3,7 +3,9 @@ FROM jevolk/construct:ubuntu-22.04-base
 ENV CXX g++-10
 ENV CC gcc-10
 
-RUN apt-get update \
-   && apt-get install --no-install-recommends -y g++-10 gcc-10 \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y g++-10 gcc-10 \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
diff --git a/docker/ubuntu/22.04/base-gcc-11/Dockerfile b/docker/ubuntu/22.04/base-gcc-11/Dockerfile
index 43ec7aeab..6ce4153a4 100644
--- a/docker/ubuntu/22.04/base-gcc-11/Dockerfile
+++ b/docker/ubuntu/22.04/base-gcc-11/Dockerfile
@@ -3,7 +3,9 @@ FROM jevolk/construct:ubuntu-22.04-base
 ENV CXX g++-11
 ENV CC gcc-11
 
-RUN apt-get update \
-   && apt-get install --no-install-recommends -y g++-11 gcc-11 \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y g++-11 gcc-11 \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
diff --git a/docker/ubuntu/22.04/base-gcc-12/Dockerfile b/docker/ubuntu/22.04/base-gcc-12/Dockerfile
index b62ee3481..a3153b52b 100644
--- a/docker/ubuntu/22.04/base-gcc-12/Dockerfile
+++ b/docker/ubuntu/22.04/base-gcc-12/Dockerfile
@@ -3,7 +3,9 @@ FROM jevolk/construct:ubuntu-22.04-base
 ENV CXX g++-12
 ENV CC gcc-12
 
-RUN apt-get update \
-   && apt-get install --no-install-recommends -y g++-12 gcc-12 \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y g++-12 gcc-12 \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
diff --git a/docker/ubuntu/22.04/base-gcc-8/Dockerfile b/docker/ubuntu/22.04/base-gcc-8/Dockerfile
index f964c0d63..76c17b150 100644
--- a/docker/ubuntu/22.04/base-gcc-8/Dockerfile
+++ b/docker/ubuntu/22.04/base-gcc-8/Dockerfile
@@ -3,7 +3,9 @@ FROM jevolk/construct:ubuntu-22.04-base
 ENV CXX g++-8
 ENV CC gcc-8
 
-RUN apt-get update \
-   && apt-get install --no-install-recommends -y g++-8 gcc-8 \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y g++-8 gcc-8 \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
diff --git a/docker/ubuntu/22.04/base-gcc-9/Dockerfile b/docker/ubuntu/22.04/base-gcc-9/Dockerfile
index bed0f840e..76793ed36 100644
--- a/docker/ubuntu/22.04/base-gcc-9/Dockerfile
+++ b/docker/ubuntu/22.04/base-gcc-9/Dockerfile
@@ -3,7 +3,9 @@ FROM jevolk/construct:ubuntu-22.04-base
 ENV CXX g++-9
 ENV CC gcc-9
 
-RUN apt-get update \
-   && apt-get install --no-install-recommends -y g++-9 gcc-9 \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y g++-9 gcc-9 \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
diff --git a/docker/ubuntu/22.04/base/Dockerfile b/docker/ubuntu/22.04/base/Dockerfile
index d8bcbc3e2..07e9bf468 100644
--- a/docker/ubuntu/22.04/base/Dockerfile
+++ b/docker/ubuntu/22.04/base/Dockerfile
@@ -2,9 +2,9 @@ FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN \
-    apt-get update && \
-    apt-get install --no-install-recommends -y \
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y \
         autoconf \
         autoconf-archive \
         autoconf2.13 \
@@ -24,25 +24,27 @@ RUN \
         libtool \
         libzstd-dev \
         shtool \
-        xz-utils && \
-	update-ca-certificates && \
-    apt-get clean && \
-    apt-get autoremove --purge -y && \
-    rm -rf /var/lib/apt/lists/*
+        xz-utils \
+	&& update-ca-certificates \
+    && apt-get clean \
+    && apt-get autoremove --purge -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
 
 ENV ROCKSDB_VERSION=6.11.4
 ARG skiprocks
 
-RUN \
-	if test -n "$skiprocks"; then \
+RUN true \
+	&& if test -n "$skiprocks"; then \
 		exit 0; \
-	fi && \
-    cd /usr/src && \
-    curl -sL https://codeload.github.com/facebook/rocksdb/tar.gz/refs/tags/v${ROCKSDB_VERSION} -o rocksdb-${ROCKSDB_VERSION}.tar.gz && \
-    tar xfvz rocksdb-${ROCKSDB_VERSION}.tar.gz && \
-    rm rocksdb-${ROCKSDB_VERSION}.tar.gz && \
-    ln -s /usr/src/rocksdb-${ROCKSDB_VERSION} /usr/src/rocksdb && \
-    cd /usr/src/rocksdb-${ROCKSDB_VERSION} && \
+	fi \
+    && cd /usr/src \
+    && curl -sL https://codeload.github.com/facebook/rocksdb/tar.gz/refs/tags/v${ROCKSDB_VERSION} -o rocksdb-${ROCKSDB_VERSION}.tar.gz \
+    && tar xfvz rocksdb-${ROCKSDB_VERSION}.tar.gz \
+    && rm rocksdb-${ROCKSDB_VERSION}.tar.gz \
+    && ln -s /usr/src/rocksdb-${ROCKSDB_VERSION} /usr/src/rocksdb \
+    && cd /usr/src/rocksdb-${ROCKSDB_VERSION} \
+    && \
     CFLAGS="-g0" \
     LDFLAGS="-Wl,--strip-all" \
     cmake -H. -Bbuild \
@@ -59,9 +61,10 @@ RUN \
         -DWITH_LZ4=1 \
         -DWITH_ZSTD=1 \
         -DUSE_RTTI=1 \
-        -DBUILD_SHARED_LIBS=1 && \
-    cmake --build build --target install && \
-    rm -rf build
+        -DBUILD_SHARED_LIBS=1 \
+    && cmake --build build --target install \
+    && rm -rf build \
+	&& true
 
 RUN mkdir /build
 WORKDIR /build
diff --git a/docker/ubuntu/22.04/full-clang-14/Dockerfile b/docker/ubuntu/22.04/full-clang-14/Dockerfile
index 26f421147..5c16b595e 100644
--- a/docker/ubuntu/22.04/full-clang-14/Dockerfile
+++ b/docker/ubuntu/22.04/full-clang-14/Dockerfile
@@ -3,8 +3,10 @@ FROM jevolk/construct:ubuntu-22.04-full
 ENV CC clang-14
 ENV CXX clang++-14
 
-RUN apt-get update \
-   && apt-get install --no-install-recommends -y clang-14 llvm-14-dev \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y clang-14 llvm-14-dev \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
 
diff --git a/docker/ubuntu/22.04/full/Dockerfile b/docker/ubuntu/22.04/full/Dockerfile
index 36df66265..f64569580 100644
--- a/docker/ubuntu/22.04/full/Dockerfile
+++ b/docker/ubuntu/22.04/full/Dockerfile
@@ -2,15 +2,16 @@ FROM jevolk/construct:ubuntu-22.04-base
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN \
-    apt-get update && \
-    apt-get install --no-install-recommends -y \
+RUN true \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y \
         opencl-headers \
         libgraphicsmagick1-dev \
         libicu-dev \
         libjemalloc-dev \
         libopencl-clang-dev \
-        libpng-dev && \
-    apt-get clean && \
-    apt-get autoremove --purge -y && \
-    rm -rf /var/lib/apt/lists/*
+        libpng-dev \
+    && apt-get clean \
+    && apt-get autoremove --purge -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && true