diff --git a/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/JBossIT.java b/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/JBossIT.java
index 244fba078c..5f351ec30e 100644
--- a/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/JBossIT.java
+++ b/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/JBossIT.java
@@ -38,8 +38,8 @@
 @RunWith(Parameterized.class)
 public class JBossIT extends AbstractServletContainerIntegrationTest {
 
-    public JBossIT(final String jbossVersion) {
-        super(new GenericContainer<>("registry.access.redhat.com/" + jbossVersion)
+    public JBossIT(final String jbossImageName) {
+        super(new GenericContainer<>(jbossImageName)
                 // this overrides the defaults, so we have to manually re-add preferIPv4Stack
                 // the other defaults don't seem to be important
                 .withEnv("JAVA_OPTS", "-javaagent:/elastic-apm-agent.jar -Djava.net.preferIPv4Stack=true " +
@@ -52,10 +52,12 @@ public JBossIT(final String jbossVersion) {
     @Parameterized.Parameters(name = "JBoss {0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(new Object[][]{
-            {"jboss-eap-6/eap64-openshift"},
-            {"jboss-eap-7/eap70-openshift"},
-            {"jboss-eap-7/eap71-openshift"},
-            {"jboss-eap-7/eap72-openshift"}
+            {"registry.access.redhat.com/jboss-eap-6/eap64-openshift"},
+            {"registry.access.redhat.com/jboss-eap-7/eap70-openshift"},
+            {"registry.access.redhat.com/jboss-eap-7/eap71-openshift"},
+            {"registry.access.redhat.com/jboss-eap-7/eap72-openshift"},
+            {"registry.redhat.io/jboss-eap-7/eap73-openjdk8-openshift-rhel7"},
+            {"registry.redhat.io/jboss-eap-7/eap73-openjdk11-openshift-rhel8"}
         });
     }
 
diff --git a/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/TomcatIT.java b/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/TomcatIT.java
index e255511b77..d4c73fbc2e 100644
--- a/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/TomcatIT.java
+++ b/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/TomcatIT.java
@@ -55,7 +55,12 @@ public static Iterable<Object[]> data() {
             {"8.5-jre8-slim"},
             {"9-jre9-slim"},
             {"9-jre10-slim"},
-            {"9-jre11-slim"}
+            {"9-jre11-slim"},
+            {"9.0.39-jdk14-openjdk-oracle"}
+// Note: not compatible yet
+//          {"10.0.0-jdk8"},
+//          {"10.0.0-jdk11"},
+//          {"10.0.0-jdk14"}
         });
     }
 
diff --git a/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/WildFlyIT.java b/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/WildFlyIT.java
index ad1befa969..a70f3611ab 100644
--- a/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/WildFlyIT.java
+++ b/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/WildFlyIT.java
@@ -59,7 +59,12 @@ public static Iterable<Object[]> data() {
             {"13.0.0.Final"},
             {"14.0.0.Final"},
             {"15.0.0.Final"},
-            {"16.0.0.Final"}
+            {"16.0.0.Final"},
+            {"17.0.0.Final"},
+            {"18.0.0.Final"},
+            {"19.0.0.Final"},
+            {"20.0.0.Final"},
+            {"21.0.0.Final"}
         });
     }