diff --git a/smoke-tests/matrix/build.gradle b/smoke-tests/matrix/build.gradle
index 685cbfd17f..afcf1311af 100644
--- a/smoke-tests/matrix/build.gradle
+++ b/smoke-tests/matrix/build.gradle
@@ -38,12 +38,14 @@ def linuxTargets = [
     [version: ["11.0.1"], vm: ["openj9"], jdk: ["11", "16"], war: "servlet-5.0"]
   ],
   "tomcat" : [
-    [version: ["7.0.107"], vm: ["hotspot", "openj9"], jdk: ["8"]],
-    [version: ["8.5.60", "9.0.40"], vm: ["hotspot", "openj9"], jdk: ["8", "11"]],
-    // TODO (trask) bump 15 to 16 (well, 17 very shortly)
-    //  note: this requires some work since there is no tomcat image for 16-openj9
-    //  and the hotspot image tag has changed naming convention
-    [version: ["10.0.4"], vm: ["hotspot", "openj9"], jdk: ["11", "15"], war: "servlet-5.0"]
+    [version: ["7.0.109"], vm: ["hotspot"], jdk: ["8"], args: [tagSuffix: ""]],
+    [version: ["7.0.109"], vm: ["openj9"], jdk: ["8"], args: [tagSuffix: "-adoptopenjdk-openj9"]],
+    [version: ["8.5.71", "9.0.53"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [tagSuffix: ""]],
+    // 8.5.70 and 9.0.52 are the latest tomcat images published with openj9 (and there's no jdk 17)
+    [version: ["8.5.70", "9.0.52"], vm: ["openj9"], jdk: ["8", "11"], args: [tagSuffix: "-adoptopenjdk-openj9"]],
+    [version: ["10.0.11"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [tagSuffix: ""], war: "servlet-5.0"],
+    // 10.0.8 is the latest tomcat image published with openj9 (and there's no jdk 17)
+    [version: ["10.0.8"], vm: ["openj9"], jdk: ["8", "11"], args: [tagSuffix: "-adoptopenjdk-openj9"], war: "servlet-5.0"]
   ],
   "tomee"  : [
     [version: ["7.0.0"], vm: ["hotspot"], jdk: ["8"]],
@@ -77,10 +79,13 @@ def windowsTargets = [
     [version: ["11.0.1"], vm: ["openj9"], jdk: ["11", "16"], dockerfile: "jetty-split", args: [sourceVersion: "11.0.1"], war: "servlet-5.0"]
   ],
   "tomcat" : [
-    [version: ["7.0.107"], vm: ["hotspot", "openj9"], jdk: ["8"], args: [majorVersion: "7"]],
-    [version: ["8.5.60"], vm: ["hotspot", "openj9"], jdk: ["8", "11"], args: [majorVersion: "8"]],
-    [version: ["9.0.40"], vm: ["hotspot", "openj9"], jdk: ["8", "11"], args: [majorVersion: "9"]],
-    [version: ["10.0.4"], vm: ["hotspot", "openj9"], jdk: ["11", "15"], args: [majorVersion: "10"], war: "servlet-5.0"],
+    [version: ["7.0.109"], vm: ["hotspot", "openj9"], jdk: ["8"], args: [majorVersion: "7"]],
+    [version: ["8.5.71"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [majorVersion: "8"]],
+    [version: ["8.5.70"], vm: ["openj9"], jdk: ["8", "11"], args: [majorVersion: "8"]],
+    [version: ["9.0.53"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [majorVersion: "9"]],
+    [version: ["9.0.52"], vm: ["openj9"], jdk: ["8", "11"], args: [majorVersion: "9"]],
+    [version: ["10.0.11"], vm: ["hotspot"], jdk: ["8", "11", "17"], args: [majorVersion: "10"], war: "servlet-5.0"],
+    [version: ["10.0.8"], vm: ["openj9"], jdk: ["8", "11"], args: [majorVersion: "10"], war: "servlet-5.0"]
   ],
   "tomee"  : [
     [version: ["7.0.0"], vm: ["hotspot", "openj9"], jdk: ["8"]],
diff --git a/smoke-tests/matrix/src/tomcat.dockerfile b/smoke-tests/matrix/src/tomcat.dockerfile
index 3f159df474..deac0166ad 100644
--- a/smoke-tests/matrix/src/tomcat.dockerfile
+++ b/smoke-tests/matrix/src/tomcat.dockerfile
@@ -1,7 +1,7 @@
 ARG version
 ARG jdk
-ARG vm
+ARG tagSuffix
 
-FROM tomcat:${version}-jdk${jdk}-adoptopenjdk-${vm}
+FROM tomcat:${version}-jdk${jdk}${tagSuffix}
 
 COPY app.war /usr/local/tomcat/webapps/
\ No newline at end of file