diff --git a/compose/sample_apps/gameserver.yml b/compose/sample_apps/gameserver-jdk11.yml
similarity index 73%
rename from compose/sample_apps/gameserver.yml
rename to compose/sample_apps/gameserver-jdk11.yml
index 75f0931dd..e343948fd 100644
--- a/compose/sample_apps/gameserver.yml
+++ b/compose/sample_apps/gameserver-jdk11.yml
@@ -1,20 +1,20 @@
 version: "3"
 services:
-  gameserver:
+  gameserver-jdk11:
     depends_on:
       cryostat:
         condition: service_healthy
-    image: ${GAMESERVER_TEST_IMAGE:-quay.io/redhat-java-monitoring/gameserver-cryostat-agent:latest}
-    hostname: gameserver
+    image: ${GAMESERVER_JDK11_TEST_IMAGE:-quay.io/redhat-java-monitoring/gameserver-cryostat-agent:latest-jdk11}
+    hostname: gameserver-jdk11
     ports:
       - "7091"
       - "9494"
       - "25565:25565"
     environment:
-      CRYOSTAT_AGENT_APP_NAME: gameserver
-      CRYOSTAT_AGENT_WEBSERVER_HOST: gameserver
+      CRYOSTAT_AGENT_APP_NAME: gameserver-jdk11
+      CRYOSTAT_AGENT_WEBSERVER_HOST: gameserver-jdk11
       CRYOSTAT_AGENT_WEBSERVER_PORT: 9494
-      CRYOSTAT_AGENT_CALLBACK: http://gameserver:9494/
+      CRYOSTAT_AGENT_CALLBACK: http://gameserver-jdk11:9494/
       CRYOSTAT_AGENT_BASEURI: ${CRYOSTAT_PROXY_PROTOCOL}://${CRYOSTAT_HTTP_HOST}:${CRYOSTAT_PROXY_PORT}/
       CRYOSTAT_AGENT_BASEURI_RANGE: public
       CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUST_ALL: "true"
@@ -27,10 +27,11 @@ services:
       CRYOSTAT_AGENT_HARVESTER_MAX_FILES: 3
       CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_AGE_MS: 60000
       CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_SIZE_B: 153600 # "$(echo 1024*150 | bc)"
+      VERSION: 1.16.5
       EULA: "true"
       ONLINE_MODE: "false"
       OVERRIDE_SERVER_PROPERTIES: "true"
       ENABLE_JMX: "true"
-      JMX_HOST: gameserver
+      JMX_HOST: gameserver-jdk11
       JMX_PORT: "7091"
       JVM_OPTS: -javaagent:/opt/cryostat/agent.jar
diff --git a/compose/sample_apps/gameserver-jdk17.yml b/compose/sample_apps/gameserver-jdk17.yml
new file mode 100644
index 000000000..a3f086c8f
--- /dev/null
+++ b/compose/sample_apps/gameserver-jdk17.yml
@@ -0,0 +1,36 @@
+version: "3"
+services:
+  gameserver-jdk17:
+    depends_on:
+      cryostat:
+        condition: service_healthy
+    image: ${GAMESERVER_JDK17_TEST_IMAGE:-quay.io/redhat-java-monitoring/gameserver-cryostat-agent:latest-jdk17}
+    hostname: gameserver-jdk17
+    ports:
+      - "7092"
+      - "9495"
+    environment:
+      CRYOSTAT_AGENT_APP_NAME: gameserver-jdk17
+      CRYOSTAT_AGENT_WEBSERVER_HOST: gameserver-jdk17
+      CRYOSTAT_AGENT_WEBSERVER_PORT: 9495
+      CRYOSTAT_AGENT_CALLBACK: http://gameserver-jdk17:9495/
+      CRYOSTAT_AGENT_BASEURI: ${CRYOSTAT_PROXY_PROTOCOL}://${CRYOSTAT_HTTP_HOST}:${CRYOSTAT_PROXY_PORT}/
+      CRYOSTAT_AGENT_BASEURI_RANGE: public
+      CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUST_ALL: "true"
+      CRYOSTAT_AGENT_WEBCLIENT_TLS_VERIFY_HOSTNAME: "false"
+      CRYOSTAT_AGENT_AUTHORIZATION_TYPE: basic
+      CRYOSTAT_AGENT_AUTHORIZATION_VALUE: user:pass
+      CRYOSTAT_AGENT_API_WRITES_ENABLED: "true"
+      CRYOSTAT_AGENT_HARVESTER_TEMPLATE: Profiling
+      CRYOSTAT_AGENT_HARVESTER_PERIOD_MS: 300000
+      CRYOSTAT_AGENT_HARVESTER_MAX_FILES: 3
+      CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_AGE_MS: 60000
+      CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_SIZE_B: 153600 # "$(echo 1024*150 | bc)"
+      VERSION: 1.20.4
+      EULA: "true"
+      ONLINE_MODE: "false"
+      OVERRIDE_SERVER_PROPERTIES: "true"
+      ENABLE_JMX: "true"
+      JMX_HOST: gameserver-jdk17
+      JMX_PORT: "7092"
+      JVM_OPTS: -javaagent:/opt/cryostat/agent.jar
diff --git a/compose/sample_apps/gameserver-jdk21.yml b/compose/sample_apps/gameserver-jdk21.yml
new file mode 100644
index 000000000..5d8a6f1a0
--- /dev/null
+++ b/compose/sample_apps/gameserver-jdk21.yml
@@ -0,0 +1,36 @@
+version: "3"
+services:
+  gameserver-jdk21:
+    depends_on:
+      cryostat:
+        condition: service_healthy
+    image: ${GAMESERVER_JDK21_TEST_IMAGE:-quay.io/redhat-java-monitoring/gameserver-cryostat-agent:latest-jdk21}
+    hostname: gameserver-jdk21
+    ports:
+      - "7093"
+      - "9496"
+    environment:
+      CRYOSTAT_AGENT_APP_NAME: gameserver-jdk21
+      CRYOSTAT_AGENT_WEBSERVER_HOST: gameserver-jdk21
+      CRYOSTAT_AGENT_WEBSERVER_PORT: 9496
+      CRYOSTAT_AGENT_CALLBACK: http://gameserver-jdk21:9496/
+      CRYOSTAT_AGENT_BASEURI: ${CRYOSTAT_PROXY_PROTOCOL}://${CRYOSTAT_HTTP_HOST}:${CRYOSTAT_PROXY_PORT}/
+      CRYOSTAT_AGENT_BASEURI_RANGE: public
+      CRYOSTAT_AGENT_WEBCLIENT_TLS_TRUST_ALL: "true"
+      CRYOSTAT_AGENT_WEBCLIENT_TLS_VERIFY_HOSTNAME: "false"
+      CRYOSTAT_AGENT_AUTHORIZATION_TYPE: basic
+      CRYOSTAT_AGENT_AUTHORIZATION_VALUE: user:pass
+      CRYOSTAT_AGENT_API_WRITES_ENABLED: "true"
+      CRYOSTAT_AGENT_HARVESTER_TEMPLATE: Profiling
+      CRYOSTAT_AGENT_HARVESTER_PERIOD_MS: 300000
+      CRYOSTAT_AGENT_HARVESTER_MAX_FILES: 3
+      CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_AGE_MS: 60000
+      CRYOSTAT_AGENT_HARVESTER_EXIT_MAX_SIZE_B: 153600 # "$(echo 1024*150 | bc)"
+      VERSION: 1.20.5
+      EULA: "true"
+      ONLINE_MODE: "false"
+      OVERRIDE_SERVER_PROPERTIES: "true"
+      ENABLE_JMX: "true"
+      JMX_HOST: gameserver-jdk21
+      JMX_PORT: "7093"
+      JVM_OPTS: -javaagent:/opt/cryostat/agent.jar