diff --git a/sechub-pds-solutions/findsecuritybugs/docker/FindSecurityBugs-Debian.dockerfile b/sechub-pds-solutions/findsecuritybugs/docker/FindSecurityBugs-Debian.dockerfile
index c6d22ee635..3ff2649505 100644
--- a/sechub-pds-solutions/findsecuritybugs/docker/FindSecurityBugs-Debian.dockerfile
+++ b/sechub-pds-solutions/findsecuritybugs/docker/FindSecurityBugs-Debian.dockerfile
@@ -24,7 +24,7 @@ USER root
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
     apt-get --assume-yes upgrade  && \
-    apt-get --assume-yes install dos2unix unzip wget openjdk-17-jre-headless libxml2-utils && \
+    apt-get --assume-yes install dos2unix unzip wget libxml2-utils && \
     apt-get --assume-yes clean
 
 # Install FindSecurityBugs
diff --git a/sechub-pds-solutions/owaspzap/docker/Owasp-Zap-Debian.dockerfile b/sechub-pds-solutions/owaspzap/docker/Owasp-Zap-Debian.dockerfile
index df1bed66e7..9971af781e 100644
--- a/sechub-pds-solutions/owaspzap/docker/Owasp-Zap-Debian.dockerfile
+++ b/sechub-pds-solutions/owaspzap/docker/Owasp-Zap-Debian.dockerfile
@@ -34,7 +34,7 @@ COPY pds-config.json "$PDS_FOLDER/pds-config.json"
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
     apt-get upgrade --assume-yes && \
-    apt-get install --assume-yes openjdk-17-jre firefox-esr wget && \
+    apt-get install --assume-yes firefox-esr wget && \
     apt-get clean
 
 # Install ZAP
diff --git a/sechub-pds-solutions/pds-base/docker/PDS-Debian.dockerfile b/sechub-pds-solutions/pds-base/docker/PDS-Debian.dockerfile
index 8a3d0d47aa..0bc307e713 100644
--- a/sechub-pds-solutions/pds-base/docker/PDS-Debian.dockerfile
+++ b/sechub-pds-solutions/pds-base/docker/PDS-Debian.dockerfile
@@ -142,8 +142,9 @@ LABEL org.opencontainers.image.title="SecHub PDS Base Image"
 LABEL org.opencontainers.image.description="The base image for the SecHub Product Delegation Server (PDS)"
 LABEL maintainer="SecHub FOSS Team"
 
-ARG PDS_ARTIFACT_FOLDER
+ARG JAVA_DISTRIBUTION
 ARG JAVA_VERSION
+ARG PDS_ARTIFACT_FOLDER
 ARG PDS_VERSION
 
 # env vars in container