diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8d4b2001..55e9ffc67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Update OS packages by default and bump gitleaks version ([#1049](https://github.com/opendevstack/ods-quickstarters/issues/1049))
+- Install java 17 devel only in scala and jdk agents ([#1057](https://github.com/opendevstack/ods-quickstarters/pull/1057))
 - Update Angular, Ionic and Typescript Quickstarters ([#1033](https://github.com/opendevstack/ods-quickstarters/issues/1033))
 - Update Rust Axum Quickstarter to Rust 1.79.0 ([#1024](https://github.com/opendevstack/ods-quickstarters/pull/1024))
 - Update jdk and scala quickstarters and agents ([#1032](https://github.com/opendevstack/ods-quickstarters/issues/1032))
diff --git a/common/jenkins-agents/jdk/docker/Dockerfile.ubi8 b/common/jenkins-agents/jdk/docker/Dockerfile.ubi8
index 47579a0f9..87e20335f 100644
--- a/common/jenkins-agents/jdk/docker/Dockerfile.ubi8
+++ b/common/jenkins-agents/jdk/docker/Dockerfile.ubi8
@@ -24,9 +24,9 @@ ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -Dsun.zip.disableMemoryM
 # COPY certs/* /etc/pki/ca-trust/source/anchors/
 # RUN update-ca-trust force-enable && update-ca-trust extract
 
-# Install Java 11, 21 and binutils (Java 17 comes from base agent)
+# Install Java devel 11, 17 21 and binutils
 # Note: use java scripts are executed to test the scripts but also use-j11.sh in called 3nd place to set is as default version
-RUN yum install -y java-11-openjdk-devel java-21-openjdk-devel binutils && \
+RUN yum install -y java-11-openjdk-devel java-17-openjdk-devel java-21-openjdk-devel binutils && \
     yum clean all -y && \
     rm -rf /var/cache/yum
 
diff --git a/common/jenkins-agents/scala/docker/Dockerfile.ubi8 b/common/jenkins-agents/scala/docker/Dockerfile.ubi8
index 525a570c6..c6b15663d 100644
--- a/common/jenkins-agents/scala/docker/Dockerfile.ubi8
+++ b/common/jenkins-agents/scala/docker/Dockerfile.ubi8
@@ -9,13 +9,13 @@ ARG nexusPassword
 # Container support is now integrated in Java 11, the +UseCGroupMemoryLimitForHeap option has been pruned
 ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -Dsun.zip.disableMemoryMapping=true"
 
-# Install sbt and java 11 (for retrocompatibility)
+# Install sbt and java devel 11/17
 ENV SBT_VERSION=1.8.2
 ENV SBT_CREDENTIALS="$HOME/.sbt/.credentials"
 RUN rm -f /etc/yum.repos.d/bintray-rpm.repo && \
     curl -L https://www.scala-sbt.org/sbt-rpm.repo > sbt-rpm.repo && \
     mv sbt-rpm.repo /etc/yum.repos.d/ && \
-    yum -y install sbt-$SBT_VERSION java-11-openjdk-devel && \
+    yum -y install sbt-$SBT_VERSION java-11-openjdk-devel java-17-openjdk-devel && \
     yum clean all && \
     rm -rf /var/cache/yum
 
diff --git a/docs/modules/jenkins-agents/pages/jdk.adoc b/docs/modules/jenkins-agents/pages/jdk.adoc
index ee5ae33c5..b21462cba 100644
--- a/docs/modules/jenkins-agents/pages/jdk.adoc
+++ b/docs/modules/jenkins-agents/pages/jdk.adoc
@@ -27,6 +27,7 @@ NOTE: like this example, you will need to switch back to `java 17` after running
 
 Dockerfile.ubi8 installs:
 - java-21-openjdk-devel
+- java-17-openjdk-devel
 - java-11-openjdk-devel
 
 == Known limitations
diff --git a/docs/modules/jenkins-agents/pages/scala.adoc b/docs/modules/jenkins-agents/pages/scala.adoc
index 9afae8052..58c864181 100644
--- a/docs/modules/jenkins-agents/pages/scala.adoc
+++ b/docs/modules/jenkins-agents/pages/scala.adoc
@@ -27,6 +27,7 @@ NOTE: like this example, you will need to switch back to `java 17` after running
 == Installed packages
 
 Dockerfile.ubi8 installs:
+- java-17-openjdk-devel
 - java-11-openjdk-devel
 
 == Known limitations