diff --git a/2024.1/base/cpp.Dockerfile b/2024.1/base/cpp.Dockerfile
index 389e61a0..b7831633 100644
--- a/2024.1/base/cpp.Dockerfile
+++ b/2024.1/base/cpp.Dockerfile
@@ -2,6 +2,37 @@ ARG BASE_TAG="bookworm-slim"
 
 FROM debian:$BASE_TAG
 
+# renovate: datasource=repology depName=debian_12/ca-certificates versioning=loose
+ENV CA_CERTIFICATES_VERSION="20230311"
+# renovate: datasource=repology depName=debian_12/curl versioning=loose
+ENV CURL_VERSION="7.88.1-10+deb12u5"
+# renovate: datasource=repology depName=debian_12/git versioning=loose
+ENV GIT_VERSION="1:2.39.2-1.1"
+# renovate: datasource=repology depName=debian_12/git-lfs versioning=loose
+ENV GIT_LFS_VERSION="3.3.0-1+b5"
+# renovate: datasource=repology depName=debian_12/gnupg2 versioning=loose
+ENV GNUPG2_VERSION="2.2.40-1.1"
+# renovate: datasource=repology depName=debian_12/default-jre versioning=loose
+ENV DEFAULT_JRE_VERSION="2:1.17-74"
+# renovate: datasource=repology depName=debian_12/apt-transport-https versioning=loose
+ENV APT_TRANSPORT_HTTPS_VERSION="2.6.1"
+# renovate: datasource=repology depName=debian_12/autoconf versioning=loose
+ENV AUTOCONF_VERSION="2.71-3"
+# renovate: datasource=repology depName=debian_12/automake versioning=loose
+ENV AUTOMAKE_VERSION="1:1.16.5-1.3"
+# renovate: datasource=repology depName=debian_12/cmake versioning=loose
+ENV CMAKE_VERSION="3.25.1-1"
+# renovate: datasource=repology depName=debian_12/dpkg-dev versioning=loose
+ENV DPKG_DEV_VERSION="1.21.22"
+# renovate: datasource=repology depName=debian_12/file versioning=loose
+ENV FILE_VERSION="1:5.44-3"
+# renovate: datasource=repology depName=debian_12/make versioning=loose
+ENV MAKE_VERSION="4.3-4.1"
+# renovate: datasource=repology depName=debian_12/patch versioning=loose
+ENV PATCH_VERSION="2.7.6-7"
+# renovate: datasource=repology depName=debian_12/libc6-dev versioning=loose
+ENV LIBC6_DEV_VERSION="2.36-9+deb12u6"
+
 ENV QODANA_DATA="/data" \
     QODANA_DOCKER="true"
 ENV PATH="/opt/qodana:${PATH}"
@@ -10,32 +41,39 @@ ENV CXX="/usr/lib/llvm-16/bin/clang++" \
     CC="/usr/lib/llvm-16/bin/clang" \
     CPLUS_INCLUDE_PATH="/usr/lib/clang/16/include"
 
-RUN apt-get -qq update; \
-    apt-get install -qqy --no-install-recommends \
-      gnupg2 \
-      wget \
-      ca-certificates \
-      apt-transport-https \
-      autoconf \
-      automake \
-      cmake \
-      dpkg-dev \
-      file \
-      make \
-      patch \
-      libc6-dev \
-      git \
-      default-jre
+# hadolint ignore=SC2174,DL3009
+RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
+    --mount=target=/var/cache/apt,type=cache,sharing=locked \
+    rm -f /etc/apt/apt.conf.d/docker-clean && \
+    mkdir -m 777 -p /opt/qodana $QODANA_DATA/project $QODANA_DATA/cache $QODANA_DATA/results && apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        ca-certificates=$CA_CERTIFICATES_VERSION \
+        curl=$CURL_VERSION \
+        default-jre=$DEFAULT_JRE_VERSION \
+        git=$GIT_VERSION \
+        git-lfs=$GIT_LFS_VERSION \
+        gnupg2=$GNUPG2_VERSION \
+        apt-transport-https=$APT_TRANSPORT_HTTPS_VERSION \
+        autoconf=$AUTOCONF_VERSION \
+        automake=$AUTOMAKE_VERSION \
+        cmake=$CMAKE_VERSION \
+        dpkg-dev=$DPKG_DEV_VERSION \
+        file=$FILE_VERSION \
+        make=$MAKE_VERSION \
+        patch=$PATCH_VERSION \
+        libc6-dev=$LIBC6_DEV_VERSION && \
+    apt-get autoremove -y && apt-get clean
 
-RUN echo "deb https://apt.llvm.org/bookworm llvm-toolchain-bookworm-16 main" \
-        > /etc/apt/sources.list.d/llvm.list && \
-    wget -qO /etc/apt/trusted.gpg.d/llvm.asc \
-        https://apt.llvm.org/llvm-snapshot.gpg.key && \
+RUN echo "deb https://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-16 main" > /etc/apt/sources.list.d/llvm.list && \
+    curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm.gpg && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys "15CF4D18AF4F7421" && \
     apt-get -qq update && \
     apt-get install -qqy -t \
       llvm-toolchain-bookworm-16 \
-      clang-16 clang-tidy-16 \
-      clang-format-16 lld-16 \
+      clang-16 \
+      clang-tidy-16 \
+      clang-format-16 \
+      lld-16 \
       libc++-16-dev \
       libc++abi-16-dev && \
     for f in /usr/lib/llvm-16/bin/*; do ln -sf "$f" /usr/bin; done && \
@@ -45,4 +83,4 @@ RUN echo "deb https://apt.llvm.org/bookworm llvm-toolchain-bookworm-16 main" \
     ln -sf clang++ /usr/bin/c++ && \
     ln -sf clang++ /usr/bin/g++ && \
     rm -rf /var/lib/apt/lists/* && \
-    mkdir -p /opt/qodana $QODANA_DATA/project $QODANA_DATA/cache $QODANA_DATA/results
+    apt-get autoremove -y && apt-get clean
diff --git a/2024.1/cpp/Dockerfile b/2024.1/cpp/Dockerfile
new file mode 100644
index 00000000..37ffe0a2
--- /dev/null
+++ b/2024.1/cpp/Dockerfile
@@ -0,0 +1,135 @@
+ARG BASE_TAG="bookworm-slim"
+
+FROM debian:$BASE_TAG
+
+# renovate: datasource=repology depName=debian_12/ca-certificates versioning=loose
+ENV CA_CERTIFICATES_VERSION="20230311"
+# renovate: datasource=repology depName=debian_12/curl versioning=loose
+ENV CURL_VERSION="7.88.1-10+deb12u5"
+# renovate: datasource=repology depName=debian_12/git versioning=loose
+ENV GIT_VERSION="1:2.39.2-1.1"
+# renovate: datasource=repology depName=debian_12/git-lfs versioning=loose
+ENV GIT_LFS_VERSION="3.3.0-1+b5"
+# renovate: datasource=repology depName=debian_12/gnupg2 versioning=loose
+ENV GNUPG2_VERSION="2.2.40-1.1"
+# renovate: datasource=repology depName=debian_12/default-jre versioning=loose
+ENV DEFAULT_JRE_VERSION="2:1.17-74"
+# renovate: datasource=repology depName=debian_12/apt-transport-https versioning=loose
+ENV APT_TRANSPORT_HTTPS_VERSION="2.6.1"
+# renovate: datasource=repology depName=debian_12/autoconf versioning=loose
+ENV AUTOCONF_VERSION="2.71-3"
+# renovate: datasource=repology depName=debian_12/automake versioning=loose
+ENV AUTOMAKE_VERSION="1:1.16.5-1.3"
+# renovate: datasource=repology depName=debian_12/cmake versioning=loose
+ENV CMAKE_VERSION="3.25.1-1"
+# renovate: datasource=repology depName=debian_12/dpkg-dev versioning=loose
+ENV DPKG_DEV_VERSION="1.21.22"
+# renovate: datasource=repology depName=debian_12/file versioning=loose
+ENV FILE_VERSION="1:5.44-3"
+# renovate: datasource=repology depName=debian_12/make versioning=loose
+ENV MAKE_VERSION="4.3-4.1"
+# renovate: datasource=repology depName=debian_12/patch versioning=loose
+ENV PATCH_VERSION="2.7.6-7"
+# renovate: datasource=repology depName=debian_12/libc6-dev versioning=loose
+ENV LIBC6_DEV_VERSION="2.36-9+deb12u6"
+# renovate: datasource=repology depName=debian_12/wget versioning=loose
+ENV WGET_VERSION="1.21.3-1+b1"
+
+ENV QODANA_DATA="/data" \
+    QODANA_DOCKER="true"
+ENV PATH="/opt/qodana:${PATH}"
+
+ENV CXX="/usr/lib/llvm-16/bin/clang++" \
+    CC="/usr/lib/llvm-16/bin/clang" \
+    CPLUS_INCLUDE_PATH="/usr/lib/clang/16/include"
+
+# hadolint ignore=SC2174,DL3009
+RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
+    --mount=target=/var/cache/apt,type=cache,sharing=locked \
+    rm -f /etc/apt/apt.conf.d/docker-clean && \
+    mkdir -m 777 -p /opt/qodana $QODANA_DATA/project $QODANA_DATA/cache $QODANA_DATA/results && apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        ca-certificates=$CA_CERTIFICATES_VERSION \
+        curl=$CURL_VERSION \
+        default-jre=$DEFAULT_JRE_VERSION \
+        git=$GIT_VERSION \
+        git-lfs=$GIT_LFS_VERSION \
+        gnupg2=$GNUPG2_VERSION \
+        apt-transport-https=$APT_TRANSPORT_HTTPS_VERSION \
+        autoconf=$AUTOCONF_VERSION \
+        automake=$AUTOMAKE_VERSION \
+        cmake=$CMAKE_VERSION \
+        dpkg-dev=$DPKG_DEV_VERSION \
+        file=$FILE_VERSION \
+        make=$MAKE_VERSION \
+        patch=$PATCH_VERSION \
+        libc6-dev=$LIBC6_DEV_VERSION && \
+    apt-get autoremove -y && apt-get clean
+
+RUN echo "deb https://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-16 main" > /etc/apt/sources.list.d/llvm.list && \
+    curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm.gpg && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys "15CF4D18AF4F7421" && \
+    apt-get -qq update && \
+    apt-get install -qqy -t \
+      llvm-toolchain-bookworm-16 \
+      clang-16 \
+      clang-tidy-16 \
+      clang-format-16 \
+      lld-16 \
+      libc++-16-dev \
+      libc++abi-16-dev && \
+    for f in /usr/lib/llvm-16/bin/*; do ln -sf "$f" /usr/bin; done && \
+    ln -sf clang /usr/bin/cc && \
+    ln -sf clang /usr/bin/c89 && \
+    ln -sf clang /usr/bin/c99 && \
+    ln -sf clang++ /usr/bin/c++ && \
+    ln -sf clang++ /usr/bin/g++ && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get autoremove -y && apt-get clean
+
+RUN apt-get update && \
+    apt-get install -y sudo && \
+    useradd -m -u 1001 -U qodana && \
+    passwd -d qodana && \
+    echo 'qodana ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+ARG QD_RELEASE="2024.1"
+ARG QD_BUILD="QDCL-$QD_RELEASE"
+# hadolint ignore=DL3003,SC2043
+RUN set -ex && \
+    dpkgArch="$(dpkg --print-architecture)" && \
+    case "$dpkgArch" in \
+        "amd64") \
+            OS_ARCH_SUFFIX=""; \
+            ;; \
+        "arm64") \
+            OS_ARCH_SUFFIX="-aarch64"; \
+            ;; \
+        *) echo "Unsupported architecture $dpkgArch" >&2; exit 1 ;; \
+    esac && \
+    QD_NAME="qodana-$QD_BUILD$OS_ARCH_SUFFIX" \
+    QD_URL="https://download.jetbrains.com/qodana/$QD_RELEASE/$QD_NAME.tar.gz" && \
+    curl -fsSL "$QD_URL" -o "/tmp/$QD_NAME.tar.gz" \
+               "$QD_URL.sha256" -o "/tmp/$QD_NAME.tar.gz.sha256" \
+               "$QD_URL.sha256.asc" -o "/tmp/$QD_NAME.tar.gz.sha256.asc" && \
+    GNUPGHOME="$(mktemp -d)" && \
+    export GNUPGHOME && \
+    for key in \
+        "B46DC71E03FEEB7F89D1F2491F7A8F87B9D8F501" \
+      ; do \
+        gpg --batch --keyserver "hkps://keys.openpgp.org" --recv-keys "$key" || \
+        gpg --batch --keyserver "keyserver.ubuntu.com" --recv-keys "$key" ; \
+    done && \
+    gpg --verify "/tmp/$QD_NAME.tar.gz.sha256.asc" "/tmp/$QD_NAME.tar.gz.sha256" && \
+    (cd /tmp && sha256sum --check --status "$QD_NAME.tar.gz.sha256") && \
+    mkdir -p /tmp/qd && tar -xzf "/tmp/$QD_NAME.tar.gz" --directory /opt/qodana  && \
+    mv /opt/qodana/qodana-clang /opt/qodana/qodana && \
+    chmod +x /opt/qodana/qodana && \
+    apt-get purge --auto-remove -y gnupg2 && \
+    rm -rf /var/cache/apt /var/lib/apt/ /tmp/* "$GNUPGHOME"
+
+ENV PATH="/opt/qodana:${PATH}"
+
+LABEL maintainer="qodana-support@jetbrains.com" description="Qodana for C/C++ (CMake)"
+WORKDIR /data/project
+ENTRYPOINT ["qodana", "scan"]
\ No newline at end of file
diff --git a/2024.1/dotnet-community/Dockerfile b/2024.1/dotnet-community/Dockerfile
index 058048ee..cc98cd00 100644
--- a/2024.1/dotnet-community/Dockerfile
+++ b/2024.1/dotnet-community/Dockerfile
@@ -92,6 +92,6 @@ RUN set -ex && \
 
 ENV PATH="/opt/qodana:${PATH}"
 
-LABEL maintainer="qodana-support@jetbrains.com" description="Qodana for .NET Community"
+LABEL maintainer="qodana-support@jetbrains.com" description="Qodana Community for .NET"
 WORKDIR /data/project
 ENTRYPOINT ["qodana", "scan"]
diff --git a/next/base/cpp.Dockerfile b/next/base/cpp.Dockerfile
index 389e61a0..b7831633 100644
--- a/next/base/cpp.Dockerfile
+++ b/next/base/cpp.Dockerfile
@@ -2,6 +2,37 @@ ARG BASE_TAG="bookworm-slim"
 
 FROM debian:$BASE_TAG
 
+# renovate: datasource=repology depName=debian_12/ca-certificates versioning=loose
+ENV CA_CERTIFICATES_VERSION="20230311"
+# renovate: datasource=repology depName=debian_12/curl versioning=loose
+ENV CURL_VERSION="7.88.1-10+deb12u5"
+# renovate: datasource=repology depName=debian_12/git versioning=loose
+ENV GIT_VERSION="1:2.39.2-1.1"
+# renovate: datasource=repology depName=debian_12/git-lfs versioning=loose
+ENV GIT_LFS_VERSION="3.3.0-1+b5"
+# renovate: datasource=repology depName=debian_12/gnupg2 versioning=loose
+ENV GNUPG2_VERSION="2.2.40-1.1"
+# renovate: datasource=repology depName=debian_12/default-jre versioning=loose
+ENV DEFAULT_JRE_VERSION="2:1.17-74"
+# renovate: datasource=repology depName=debian_12/apt-transport-https versioning=loose
+ENV APT_TRANSPORT_HTTPS_VERSION="2.6.1"
+# renovate: datasource=repology depName=debian_12/autoconf versioning=loose
+ENV AUTOCONF_VERSION="2.71-3"
+# renovate: datasource=repology depName=debian_12/automake versioning=loose
+ENV AUTOMAKE_VERSION="1:1.16.5-1.3"
+# renovate: datasource=repology depName=debian_12/cmake versioning=loose
+ENV CMAKE_VERSION="3.25.1-1"
+# renovate: datasource=repology depName=debian_12/dpkg-dev versioning=loose
+ENV DPKG_DEV_VERSION="1.21.22"
+# renovate: datasource=repology depName=debian_12/file versioning=loose
+ENV FILE_VERSION="1:5.44-3"
+# renovate: datasource=repology depName=debian_12/make versioning=loose
+ENV MAKE_VERSION="4.3-4.1"
+# renovate: datasource=repology depName=debian_12/patch versioning=loose
+ENV PATCH_VERSION="2.7.6-7"
+# renovate: datasource=repology depName=debian_12/libc6-dev versioning=loose
+ENV LIBC6_DEV_VERSION="2.36-9+deb12u6"
+
 ENV QODANA_DATA="/data" \
     QODANA_DOCKER="true"
 ENV PATH="/opt/qodana:${PATH}"
@@ -10,32 +41,39 @@ ENV CXX="/usr/lib/llvm-16/bin/clang++" \
     CC="/usr/lib/llvm-16/bin/clang" \
     CPLUS_INCLUDE_PATH="/usr/lib/clang/16/include"
 
-RUN apt-get -qq update; \
-    apt-get install -qqy --no-install-recommends \
-      gnupg2 \
-      wget \
-      ca-certificates \
-      apt-transport-https \
-      autoconf \
-      automake \
-      cmake \
-      dpkg-dev \
-      file \
-      make \
-      patch \
-      libc6-dev \
-      git \
-      default-jre
+# hadolint ignore=SC2174,DL3009
+RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
+    --mount=target=/var/cache/apt,type=cache,sharing=locked \
+    rm -f /etc/apt/apt.conf.d/docker-clean && \
+    mkdir -m 777 -p /opt/qodana $QODANA_DATA/project $QODANA_DATA/cache $QODANA_DATA/results && apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        ca-certificates=$CA_CERTIFICATES_VERSION \
+        curl=$CURL_VERSION \
+        default-jre=$DEFAULT_JRE_VERSION \
+        git=$GIT_VERSION \
+        git-lfs=$GIT_LFS_VERSION \
+        gnupg2=$GNUPG2_VERSION \
+        apt-transport-https=$APT_TRANSPORT_HTTPS_VERSION \
+        autoconf=$AUTOCONF_VERSION \
+        automake=$AUTOMAKE_VERSION \
+        cmake=$CMAKE_VERSION \
+        dpkg-dev=$DPKG_DEV_VERSION \
+        file=$FILE_VERSION \
+        make=$MAKE_VERSION \
+        patch=$PATCH_VERSION \
+        libc6-dev=$LIBC6_DEV_VERSION && \
+    apt-get autoremove -y && apt-get clean
 
-RUN echo "deb https://apt.llvm.org/bookworm llvm-toolchain-bookworm-16 main" \
-        > /etc/apt/sources.list.d/llvm.list && \
-    wget -qO /etc/apt/trusted.gpg.d/llvm.asc \
-        https://apt.llvm.org/llvm-snapshot.gpg.key && \
+RUN echo "deb https://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-16 main" > /etc/apt/sources.list.d/llvm.list && \
+    curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm.gpg && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys "15CF4D18AF4F7421" && \
     apt-get -qq update && \
     apt-get install -qqy -t \
       llvm-toolchain-bookworm-16 \
-      clang-16 clang-tidy-16 \
-      clang-format-16 lld-16 \
+      clang-16 \
+      clang-tidy-16 \
+      clang-format-16 \
+      lld-16 \
       libc++-16-dev \
       libc++abi-16-dev && \
     for f in /usr/lib/llvm-16/bin/*; do ln -sf "$f" /usr/bin; done && \
@@ -45,4 +83,4 @@ RUN echo "deb https://apt.llvm.org/bookworm llvm-toolchain-bookworm-16 main" \
     ln -sf clang++ /usr/bin/c++ && \
     ln -sf clang++ /usr/bin/g++ && \
     rm -rf /var/lib/apt/lists/* && \
-    mkdir -p /opt/qodana $QODANA_DATA/project $QODANA_DATA/cache $QODANA_DATA/results
+    apt-get autoremove -y && apt-get clean