diff --git a/.github/workflows/publish-smoke-test-grpc-images.yml b/.github/workflows/publish-smoke-test-grpc-images.yml
index 0f5beb368d..12a3db0397 100644
--- a/.github/workflows/publish-smoke-test-grpc-images.yml
+++ b/.github/workflows/publish-smoke-test-grpc-images.yml
@@ -48,8 +48,6 @@ jobs:
           echo "Pushing to tag $TAG"
           ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
           ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
-          # TODO (trask) drop JDK 15 after JDK 16 is passing
-          ./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
           ./gradlew jib -PtargetJDK=16 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
         working-directory: smoke-tests/grpc
 
diff --git a/.github/workflows/publish-smoke-test-play-images.yml b/.github/workflows/publish-smoke-test-play-images.yml
index b45e18748b..968c4fc2d5 100644
--- a/.github/workflows/publish-smoke-test-play-images.yml
+++ b/.github/workflows/publish-smoke-test-play-images.yml
@@ -48,9 +48,9 @@ jobs:
           echo "Pushing to tag $TAG"
           ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
           ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
-          # TODO (trask) drop JDK 15 after JDK 16 is passing
+          # Play doesn't support Java 16 (or 17) yet
+          # https://github.com/playframework/playframework/pull/10819
           ./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
-          ./gradlew jib -PtargetJDK=16 -Djib.httpTimeout=120000 -Djib.console=plain -Ptag=$TAG
         working-directory: smoke-tests/play
 
   issue:
diff --git a/.github/workflows/publish-smoke-test-spring-boot-images.yml b/.github/workflows/publish-smoke-test-spring-boot-images.yml
index 29ac54a7f1..2a1f94e3ee 100644
--- a/.github/workflows/publish-smoke-test-spring-boot-images.yml
+++ b/.github/workflows/publish-smoke-test-spring-boot-images.yml
@@ -48,8 +48,6 @@ jobs:
           echo "Pushing to tag $TAG"
           ./gradlew jib -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
           ./gradlew jib -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
-          # TODO (trask) drop JDK 15 after JDK 16 is passing
-          ./gradlew jib -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
           ./gradlew jib -PtargetJDK=16 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace -Ptag=$TAG
         working-directory: smoke-tests/springboot
 
diff --git a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java
index cf20a82bb1..c33120abb7 100644
--- a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java
+++ b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java
@@ -17,7 +17,7 @@ class SpringBootSmokeTest extends SmokeTest {
   protected String getTargetImage(int jdk) {
     return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk"
         + jdk
-        + "-20210218.577304949";
+        + "-20210915.1238472439";
   }
 
   @Test
diff --git a/examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java b/examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java
index e4915099d2..3bade1b709 100644
--- a/examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java
+++ b/examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java
@@ -17,7 +17,7 @@ class SpringBootIntegrationTest extends IntegrationTest {
   protected String getTargetImage(int jdk) {
     return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk"
         + jdk
-        + "-20210218.577304949";
+        + "-20210915.1238472439";
   }
 
   @Test
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy
index 55bbc74589..7a62d9b700 100644
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy
@@ -21,7 +21,7 @@ import static java.util.stream.Collectors.toSet
 class GrpcSmokeTest extends SmokeTest {
 
   protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$jdk-20210225.598590600"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$jdk-20210915.1238472435"
   }
 
   @Unroll
@@ -60,6 +60,6 @@ class GrpcSmokeTest extends SmokeTest {
     channel.shutdown()
 
     where:
-    jdk << [8, 11, 15]
+    jdk << [8, 11, 16]
   }
 }
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy
index 157459a520..579072c1e6 100644
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy
@@ -17,7 +17,7 @@ import static java.util.stream.Collectors.toSet
 class JaegerExporterSmokeTest extends SmokeTest {
 
   protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
   }
 
   @Override
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy
index 5489f92de1..841c5827ff 100644
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy
@@ -16,7 +16,7 @@ import java.util.jar.JarFile
 class NoopApiSmokeTest extends SmokeTest {
 
   protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
   }
 
   @Override
@@ -52,7 +52,7 @@ class NoopApiSmokeTest extends SmokeTest {
     stopTarget()
 
     where:
-    jdk << [8, 11, 15]
+    jdk << [8, 11, 16]
   }
 }
 
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy
index 5081327905..16d6a65d53 100644
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy
@@ -12,7 +12,7 @@ import spock.lang.IgnoreIf
 class PlaySmokeTest extends SmokeTest {
 
   protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-play-jdk$jdk-20201128.1734635"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-play-jdk$jdk-20210915.1238703013"
   }
 
   def "play smoke test on JDK #jdk"(int jdk) {
@@ -32,7 +32,8 @@ class PlaySmokeTest extends SmokeTest {
     stopTarget()
 
     where:
+    // Play doesn't support Java 16 (or 17) yet
+    // https://github.com/playframework/playframework/pull/10819
     jdk << [8, 11, 15]
   }
-
 }
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy
index 051960cc33..94198d3aed 100644
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy
@@ -15,7 +15,7 @@ abstract class PropagationTest extends SmokeTest {
 
   @Override
   protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
   }
 
   def "Should propagate test"() {
@@ -82,7 +82,7 @@ class JaegerPropagationTest extends PropagationTest {
 class OtTracePropagationTest extends SmokeTest {
   @Override
   protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
   }
 
   // OtTracer only propagates lower half of trace ID so we have to mangle the trace IDs similar to
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
index 66f87c4c09..e4f372ab8d 100644
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
@@ -19,7 +19,7 @@ import static java.util.stream.Collectors.toSet
 class SpringBootSmokeTest extends SmokeTest {
 
   protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
   }
 
   @Override
@@ -79,6 +79,6 @@ class SpringBootSmokeTest extends SmokeTest {
     stopTarget()
 
     where:
-    jdk << [8, 11, 15]
+    jdk << [8, 11, 16]
   }
 }
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy
index 395fb4eb89..7b13814e3f 100644
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy
@@ -16,7 +16,7 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest {
   static final int ALLOWED_DEVIATION = 0.1 * NUM_TRIES
 
   protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
   }
 
   @Override
@@ -45,6 +45,6 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest {
     stopTarget()
 
     where:
-    jdk << [8, 11, 15]
+    jdk << [8, 11, 16]
   }
 }
diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy
index 6974b1c0bf..a617ba6c76 100644
--- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy
+++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy
@@ -12,7 +12,7 @@ import spock.lang.IgnoreIf
 class ZipkinExporterSmokeTest extends SmokeTest {
 
   protected String getTargetImage(String jdk) {
-    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949"
+    "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439"
   }
 
   @Override