diff --git a/jpa/multitenancy/multitenancy-db/src/test/java/com/example/multitenancy/db/common/DBContainerInitializer.java b/jpa/multitenancy/multitenancy-db/src/test/java/com/example/multitenancy/db/common/DBContainerInitializer.java
index 398f822d3..d086e7796 100644
--- a/jpa/multitenancy/multitenancy-db/src/test/java/com/example/multitenancy/db/common/DBContainerInitializer.java
+++ b/jpa/multitenancy/multitenancy-db/src/test/java/com/example/multitenancy/db/common/DBContainerInitializer.java
@@ -11,16 +11,9 @@ public class DBContainerInitializer
         implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
     private static final PostgreSQLContainer<?> sqlContainer =
-            new PostgreSQLContainer<>("postgres:16.1-alpine")
-                    .withDatabaseName("integration-tests-db")
-                    .withUsername("username")
-                    .withPassword("password");
+            new PostgreSQLContainer<>("postgres:16.1-alpine");
 
-    private static final MariaDBContainer<?> mariaDBContainer =
-            new MariaDBContainer<>("mariadb")
-                    .withDatabaseName("integration-tests-db")
-                    .withUsername("username")
-                    .withPassword("password");
+    private static final MariaDBContainer<?> mariaDBContainer = new MariaDBContainer<>("mariadb");
 
     static {
         Startables.deepStart(sqlContainer, mariaDBContainer).join();
diff --git a/jpa/multitenancy/schema/src/test/java/com/example/multitenancy/schema/config/TestContainersConfiguration.java b/jpa/multitenancy/schema/src/test/java/com/example/multitenancy/schema/config/TestContainersConfiguration.java
index 7332bf973..b8ec2710c 100644
--- a/jpa/multitenancy/schema/src/test/java/com/example/multitenancy/schema/config/TestContainersConfiguration.java
+++ b/jpa/multitenancy/schema/src/test/java/com/example/multitenancy/schema/config/TestContainersConfiguration.java
@@ -13,6 +13,6 @@ public class TestContainersConfiguration {
     @ServiceConnection
     @RestartScope
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>("postgres:15.3-alpine");
+        return new PostgreSQLContainer<>("postgres:16.1-alpine");
     }
 }