diff --git a/boot-grafana-lgtm/src/test/java/com/learning/grafanalgtm/GrafanaLGTMApplicationTest.java b/boot-grafana-lgtm/src/test/java/com/learning/grafanalgtm/GrafanaLGTMApplicationTest.java
index 96d0ff8a2..ffa181f13 100644
--- a/boot-grafana-lgtm/src/test/java/com/learning/grafanalgtm/GrafanaLGTMApplicationTest.java
+++ b/boot-grafana-lgtm/src/test/java/com/learning/grafanalgtm/GrafanaLGTMApplicationTest.java
@@ -8,7 +8,7 @@
 import io.restassured.RestAssured;
 import io.restassured.authentication.PreemptiveBasicAuthScheme;
 import io.restassured.http.ContentType;
-import org.apache.hc.core5.http.HttpStatus;
+import org.apache.http.HttpStatus;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/jpa/boot-data-envers/src/test/java/com/example/envers/web/controllers/CustomerControllerIT.java b/jpa/boot-data-envers/src/test/java/com/example/envers/web/controllers/CustomerControllerIT.java
index d7b2dcd06..be24d54d4 100644
--- a/jpa/boot-data-envers/src/test/java/com/example/envers/web/controllers/CustomerControllerIT.java
+++ b/jpa/boot-data-envers/src/test/java/com/example/envers/web/controllers/CustomerControllerIT.java
@@ -13,8 +13,8 @@
 import io.restassured.http.ContentType;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.HttpStatus;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpStatus;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
diff --git a/jpa/multitenancy/multitenancy-db/pom.xml b/jpa/multitenancy/multitenancy-db/pom.xml
index 4cc4661f2..691a03d97 100644
--- a/jpa/multitenancy/multitenancy-db/pom.xml
+++ b/jpa/multitenancy/multitenancy-db/pom.xml
@@ -92,12 +92,6 @@
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
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 00eeaf5bc..70d99c7a0 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
@@ -12,7 +12,7 @@ public class DBContainerInitializer
         implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
     private static final PostgreSQLContainer<?> POSTGRE_SQL_CONTAINER =
-            new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
+            new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("16.4-alpine"));
 
     private static final MariaDBContainer<?> MARIA_DB_CONTAINER =
             new MariaDBContainer<>(DockerImageName.parse("mariadb").withTag("11.4"));