diff --git a/smoke-tests/images/security-manager/build.gradle.kts b/smoke-tests/images/security-manager/build.gradle.kts
index b7e73ec1e17d..6741a4a67607 100644
--- a/smoke-tests/images/security-manager/build.gradle.kts
+++ b/smoke-tests/images/security-manager/build.gradle.kts
@@ -28,7 +28,7 @@ java {
 val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
 
 jib {
-  from.image = "openjdk:$targetJDK"
+  from.image = "eclipse-temurin:$targetJDK"
   to.image = "ghcr.io/$repo/smoke-test-security-manager:jdk$targetJDK-$tag"
   container.mainClass = "io.opentelemetry.smoketest.securitymanager.Main"
   container.jvmFlags = listOf("-Djava.security.manager", "-Djava.security.policy=/app/resources/security.policy")
diff --git a/smoke-tests/images/spring-boot/build.gradle.kts b/smoke-tests/images/spring-boot/build.gradle.kts
index cd50cde76e12..647478aa7eb0 100644
--- a/smoke-tests/images/spring-boot/build.gradle.kts
+++ b/smoke-tests/images/spring-boot/build.gradle.kts
@@ -37,6 +37,12 @@ java {
   if (targetJDK == "8") {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
+  } else if (targetJDK == "11") {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+  } else if (targetJDK == "17") {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 }
 
@@ -51,7 +57,7 @@ springBoot {
 val repo = System.getenv("GITHUB_REPOSITORY") ?: "open-telemetry/opentelemetry-java-instrumentation"
 
 jib {
-  from.image = "openjdk:$targetJDK"
+  from.image = "eclipse-temurin:$targetJDK"
   to.image = "ghcr.io/$repo/smoke-test-spring-boot:jdk$targetJDK-$tag"
   container.ports = listOf("8080")
 }
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java
index 3b6d336aa565..9460dd1b6533 100644
--- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java
+++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java
@@ -27,7 +27,9 @@ protected void configure(SmokeTestOptions<Integer> options) {
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {8, 11, 17, 21, 25})
+  // restore after image update
+  // @ValueSource(ints = {8, 11, 17, 21, 25})
+  @ValueSource(ints = {8, 21, 25})
   void shouldExportMetrics(int jdk) {
     start(jdk);
     client().get("/greeting").aggregate().join();
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java
index 8cd51d218b67..7c66b48ec5ef 100644
--- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java
+++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java
@@ -24,7 +24,9 @@ protected void configure(SmokeTestOptions<Integer> options) {
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25
+  // restore after image update
+  // @ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25
+  @ValueSource(ints = {8, 21}) // Security Manager removed in Java 25
   void securityManagerSmokeTest(int jdk) {
     start(jdk);
     testing.waitAndAssertTraces(
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java
index 91e178822db7..22c1bd820bf8 100644
--- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java
+++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java
@@ -30,7 +30,9 @@ protected void configure(SmokeTestOptions<Integer> options) {
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {8, 11, 17, 21, 25})
+  // restore after image update
+  // @ValueSource(ints = {8, 11, 17, 21, 25})
+  @ValueSource(ints = {8, 21, 25})
   void springBootSmokeTest(int jdk) {
     SmokeTestOutput output = start(jdk);