diff --git a/pom.xml b/pom.xml
index f7d4788a3..17aeb4966 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <sonar.host.url>http://localhost:9000</sonar.host.url>
 
     <kotlin.code.style>official</kotlin.code.style>
-    <test.containers.version>1.21.3</test.containers.version>
+    <test.containers.version>2.0.1</test.containers.version>
     <osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>
 
     <!-- Reproducible Builds -->
@@ -177,13 +177,13 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
+      <artifactId>testcontainers-junit-jupiter</artifactId>
       <version>${test.containers.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>postgresql</artifactId>
+      <artifactId>testcontainers-postgresql</artifactId>
       <version>${test.containers.version}</version>
       <scope>test</scope>
     </dependency>
@@ -195,7 +195,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>mariadb</artifactId>
+      <artifactId>testcontainers-mariadb</artifactId>
       <version>${test.containers.version}</version>
       <scope>test</scope>
     </dependency>
@@ -207,7 +207,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>mysql</artifactId>
+      <artifactId>testcontainers-mysql</artifactId>
       <version>${test.containers.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/src/test/java/config/TestContainersConfiguration.java b/src/test/java/config/TestContainersConfiguration.java
index 0b39fbb85..f78bd5030 100644
--- a/src/test/java/config/TestContainersConfiguration.java
+++ b/src/test/java/config/TestContainersConfiguration.java
@@ -23,6 +23,5 @@
 public interface TestContainersConfiguration {
     DockerImageName POSTGRES_LATEST = DockerImageName.parse("postgres:18.0");
     DockerImageName MARIADB_LATEST = DockerImageName.parse("mariadb:12.0.2");
-    // Note - Can't go past MySQL:9.2.0 until this is released: https://github.com/testcontainers/testcontainers-java/pull/10185
-    DockerImageName MYSQL_LATEST = DockerImageName.parse("mysql:9.2.0");
+    DockerImageName MYSQL_LATEST = DockerImageName.parse("mysql:9.5.0");
 }
diff --git a/src/test/java/examples/custom_render/CustomRenderingTest.java b/src/test/java/examples/custom_render/CustomRenderingTest.java
index 8b0541c1e..5551b0a95 100644
--- a/src/test/java/examples/custom_render/CustomRenderingTest.java
+++ b/src/test/java/examples/custom_render/CustomRenderingTest.java
@@ -50,17 +50,16 @@
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
-import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.postgresql.PostgreSQLContainer;
 
 @Testcontainers
 class CustomRenderingTest {
 
-    @SuppressWarnings("resource")
     @Container
-    private static final PostgreSQLContainer<?> postgres =
-            new PostgreSQLContainer<>(TestContainersConfiguration.POSTGRES_LATEST)
+    private static final PostgreSQLContainer postgres =
+            new PostgreSQLContainer(TestContainersConfiguration.POSTGRES_LATEST)
                     .withInitScript("examples/custom_render/dbInit.sql");
 
     private SqlSessionFactory sqlSessionFactory;
diff --git a/src/test/java/examples/mariadb/MariaDBTest.java b/src/test/java/examples/mariadb/MariaDBTest.java
index a98b2e326..fed06dc5e 100644
--- a/src/test/java/examples/mariadb/MariaDBTest.java
+++ b/src/test/java/examples/mariadb/MariaDBTest.java
@@ -49,18 +49,16 @@
 import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper;
 import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
 import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper;
-import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-
+import org.testcontainers.mariadb.MariaDBContainer;
 
 @Testcontainers
 class MariaDBTest {
 
-    @SuppressWarnings("resource")
     @Container
-    private static final MariaDBContainer<?> mariadb =
-            new MariaDBContainer<>(TestContainersConfiguration.MARIADB_LATEST)
+    private static final MariaDBContainer mariadb =
+            new MariaDBContainer(TestContainersConfiguration.MARIADB_LATEST)
                     .withInitScript("examples/mariadb/CreateDB.sql");
 
     private static SqlSessionFactory sqlSessionFactory;
diff --git a/src/test/java/examples/mariadb/OrderByCaseTest.java b/src/test/java/examples/mariadb/OrderByCaseTest.java
index f842ecb1b..d144e442e 100644
--- a/src/test/java/examples/mariadb/OrderByCaseTest.java
+++ b/src/test/java/examples/mariadb/OrderByCaseTest.java
@@ -39,17 +39,16 @@
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
-import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mariadb.MariaDBContainer;
 
 @Testcontainers
 class OrderByCaseTest {
 
-    @SuppressWarnings("resource")
     @Container
-    private static final MariaDBContainer<?> mariadb =
-            new MariaDBContainer<>(TestContainersConfiguration.MARIADB_LATEST)
+    private static final MariaDBContainer mariadb =
+            new MariaDBContainer(TestContainersConfiguration.MARIADB_LATEST)
                     .withInitScript("examples/mariadb/CreateDB.sql");
 
     private static SqlSessionFactory sqlSessionFactory;
diff --git a/src/test/java/examples/mysql/MySQLTest.java b/src/test/java/examples/mysql/MySQLTest.java
index f9c047f77..f1eb82682 100644
--- a/src/test/java/examples/mysql/MySQLTest.java
+++ b/src/test/java/examples/mysql/MySQLTest.java
@@ -38,17 +38,16 @@
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
-import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mysql.MySQLContainer;
 
 @Testcontainers
 class MySQLTest {
 
-    @SuppressWarnings("resource")
     @Container
-    private static final MySQLContainer<?> mysql =
-            new MySQLContainer<>(TestContainersConfiguration.MYSQL_LATEST)
+    private static final MySQLContainer mysql =
+            new MySQLContainer(TestContainersConfiguration.MYSQL_LATEST)
                     .withInitScript("examples/mariadb/CreateDB.sql");
 
     private SqlSessionFactory sqlSessionFactory;
diff --git a/src/test/java/examples/postgres/PostgresTest.java b/src/test/java/examples/postgres/PostgresTest.java
index f8da9c328..368d7ce0c 100644
--- a/src/test/java/examples/postgres/PostgresTest.java
+++ b/src/test/java/examples/postgres/PostgresTest.java
@@ -35,17 +35,16 @@
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
-import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.postgresql.PostgreSQLContainer;
 
 @Testcontainers
 class PostgresTest {
 
-    @SuppressWarnings("resource")
     @Container
-    private static final PostgreSQLContainer<?> postgres =
-            new PostgreSQLContainer<>(TestContainersConfiguration.POSTGRES_LATEST)
+    private static final PostgreSQLContainer postgres =
+            new PostgreSQLContainer(TestContainersConfiguration.POSTGRES_LATEST)
                     .withInitScript("examples/postgres/dbInit.sql");
 
     private static SqlSessionFactory sqlSessionFactory;
diff --git a/src/test/java/issues/gh655/Gh655Test.java b/src/test/java/issues/gh655/Gh655Test.java
index e1eb4578f..47615572a 100644
--- a/src/test/java/issues/gh655/Gh655Test.java
+++ b/src/test/java/issues/gh655/Gh655Test.java
@@ -41,17 +41,16 @@
 import org.mybatis.dynamic.sql.select.SelectModel;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
-import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mariadb.MariaDBContainer;
 
 @Testcontainers
 class Gh655Test {
 
-    @SuppressWarnings("resource")
     @Container
-    private static final MariaDBContainer<?> mariadb =
-            new MariaDBContainer<>(TestContainersConfiguration.MARIADB_LATEST)
+    private static final MariaDBContainer mariadb =
+            new MariaDBContainer(TestContainersConfiguration.MARIADB_LATEST)
                     .withInitScript("examples/mariadb/CreateDB.sql");
 
     private static SqlSessionFactory sqlSessionFactory;
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/custom/render/KCustomRenderingTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/custom/render/KCustomRenderingTest.kt
index 47a6fcaed..72e4d0b81 100644
--- a/src/test/kotlin/examples/kotlin/mybatis3/custom/render/KCustomRenderingTest.kt
+++ b/src/test/kotlin/examples/kotlin/mybatis3/custom/render/KCustomRenderingTest.kt
@@ -35,9 +35,9 @@ import org.mybatis.dynamic.sql.util.kotlin.mybatis3.insertMultiple
 import org.mybatis.dynamic.sql.util.kotlin.mybatis3.select
 import org.mybatis.dynamic.sql.util.kotlin.mybatis3.update
 import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper
-import org.testcontainers.containers.PostgreSQLContainer
 import org.testcontainers.junit.jupiter.Container
 import org.testcontainers.junit.jupiter.Testcontainers
+import org.testcontainers.postgresql.PostgreSQLContainer
 import java.sql.JDBCType
 
 @Testcontainers
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/mariadb/KMariaDBTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/mariadb/KMariaDBTest.kt
index 28bf98a3b..c90178cba 100644
--- a/src/test/kotlin/examples/kotlin/mybatis3/mariadb/KMariaDBTest.kt
+++ b/src/test/kotlin/examples/kotlin/mybatis3/mariadb/KMariaDBTest.kt
@@ -35,9 +35,9 @@ import org.mybatis.dynamic.sql.util.kotlin.mybatis3.update
 import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper
 import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper
 import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper
-import org.testcontainers.containers.MariaDBContainer
 import org.testcontainers.junit.jupiter.Container
 import org.testcontainers.junit.jupiter.Testcontainers
+import org.testcontainers.mariadb.MariaDBContainer
 import java.util.Locale
 
 @Testcontainers