diff --git a/Linux/BaseBuilder/Dockerfile b/Linux/BaseBuilder/Dockerfile
index a216dc0..b5aa352 100644
--- a/Linux/BaseBuilder/Dockerfile
+++ b/Linux/BaseBuilder/Dockerfile
@@ -1,23 +1,16 @@
-FROM ubuntu:24.04
+FROM ubuntu:26.04
 
 # Set timezone, noninteractive mode, and pipx path
 ENV TZ=Europe/Paris \
     DEBIAN_FRONTEND=noninteractive \
     PATH="/root/.local/bin:$PATH"
 
-# Use build cache for ccache
-RUN --mount=type=cache,target=/ccache
-
-# Dummy sudo (no security weakening)
 RUN echo '#!/bin/bash\n$@' > /usr/bin/sudo \
     && chmod +x /usr/bin/sudo
 
-# Install base dependencies in one layer
 RUN apt-get update && apt-get install -y \
         unzip \
         curl \
         wget \
-        lsb-release \
-        software-properties-common \
-        gnupg \
-        python3
+        python3 \
+        pipx
diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile
index 84dacff..2c3f4f9 100644
--- a/Linux/CPPBuilder/Dockerfile
+++ b/Linux/CPPBuilder/Dockerfile
@@ -1,22 +1,12 @@
-# Build arguments
 ARG BASE_BUILDER
 
-# Base image
 FROM $BASE_BUILDER
 
-# Install system dependencies
 RUN apt-get update && apt-get install -y \
         build-essential \
-        cppcheck \
         ccache \
-        cmake \
-        ninja-build \
         git \
-        pkg-config \
-        wget \
-        lsb-release \
-        software-properties-common \
-        pipx
+        pkg-config
 
 ENV PATH="/root/.local/bin:${PATH}"
 
@@ -29,6 +19,7 @@ RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \
        done \
     && rm -f /tmp/llvm.sh*
 
+# Install Infer
 RUN VERSION=1.2.0; \
     curl -sSL "https://github.com/facebook/infer/releases/download/v$VERSION/infer-linux-x86_64-v$VERSION.tar.xz" \
     | tar -C /opt -xJ && \