diff --git a/assembly/java-base/docker/Dockerfile b/assembly/java-base/docker/Dockerfile
index 704e362f634..6a8e1132248 100644
--- a/assembly/java-base/docker/Dockerfile
+++ b/assembly/java-base/docker/Dockerfile
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2018, 2022 Eurotech and/or its affiliates and others
+# Copyright (c) 2018, 2025 Eurotech and/or its affiliates and others
 #
 # This program and the accompanying materials are made
 # available under the terms of the Eclipse Public License 2.0
@@ -16,7 +16,7 @@ FROM @docker.base.image@
 
 ENV JAVA_HOME=/usr/lib/jvm/jre-openjdk
 
-# Packages used for:
+# Install packages
 #
 # Java 11: well is Java
 # curl: required to download jetty, H2 and others
@@ -24,16 +24,17 @@ ENV JAVA_HOME=/usr/lib/jvm/jre-openjdk
 # tar: Unpack archives
 # gzip: Unpack archives
 # shadow-utils: To run useradd command
-
 RUN microdnf install -y \
     java-11-openjdk-headless \
     curl \
     openssl \
     tar \
     gzip \
-    shadow-utils \
-    && \
-    mkdir -p /opt/jolokia && \
+    shadow-utils && \
+    microdnf clean all
+
+# Install Jolokia agent
+RUN mkdir -p /opt/jolokia && \
     curl -s @jolokia.agent.url@ -o /opt/jolokia/jolokia-jvm-agent.jar
 
 # Generate X509 certificate and private key
diff --git a/assembly/jetty-base/docker/Dockerfile b/assembly/jetty-base/docker/Dockerfile
index e676d5bbf5a..dfbb0af0968 100644
--- a/assembly/jetty-base/docker/Dockerfile
+++ b/assembly/jetty-base/docker/Dockerfile
@@ -23,6 +23,7 @@ RUN useradd -u 1000 -g 0 -d '/var/opt/jetty' -s '/sbin/nologin' jetty && \
     curl -Ls @jetty.url@ -o /tmp/jetty.tar.gz && \
     tar --strip=1 -xzf /tmp/jetty.tar.gz -C /opt/jetty && \
     rm -f /tmp/jetty.tar.gz && \
+    rm -rf /opt/jetty/demo-base && \
     cd /var/opt/jetty && \
     java -jar /opt/jetty/start.jar --approve-all-licenses --create-startd --add-to-start=http,https,jsp,jstl,websocket,deploy,logging-logback,jmx,ssl,stats && \
     chown -R 1000:0 /opt/jetty /var/opt/jetty && \