diff --git a/inventory-service/pom.xml b/inventory-service/pom.xml
index 06e58035..3a788daa 100644
--- a/inventory-service/pom.xml
+++ b/inventory-service/pom.xml
@@ -20,8 +20,8 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <java.version>21</java.version>
-        <spring-cloud.version>2024.0.0-M2</spring-cloud.version>
-        <springdoc-openapi.version>2.6.0</springdoc-openapi.version>
+        <spring-cloud.version>2024.0.0-RC1</spring-cloud.version>
+        <springdoc-openapi.version>2.7.0-RC1</springdoc-openapi.version>
 
         <org.mapstruct.version>1.6.3</org.mapstruct.version>
         <testcontainers-jooq-codegen-maven-plugin.version>0.0.4</testcontainers-jooq-codegen-maven-plugin.version>
diff --git a/inventory-service/src/main/resources/application.yml b/inventory-service/src/main/resources/application.yml
index 251c1d23..c59157e2 100644
--- a/inventory-service/src/main/resources/application.yml
+++ b/inventory-service/src/main/resources/application.yml
@@ -30,3 +30,8 @@ spring:
   threads:
     virtual:
       enabled: true
+  http:
+    client:
+      factory: jdk
+  main:
+    web-application-type: servlet
\ No newline at end of file
diff --git a/inventory-service/src/test/java/com/example/inventoryservice/TestInventoryApplication.java b/inventory-service/src/test/java/com/example/inventoryservice/TestInventoryApplication.java
index 58dae350..cf34eb4e 100644
--- a/inventory-service/src/test/java/com/example/inventoryservice/TestInventoryApplication.java
+++ b/inventory-service/src/test/java/com/example/inventoryservice/TestInventoryApplication.java
@@ -6,9 +6,9 @@ Licensed under MIT License Copyright (c) 2023-2024 Raja Kolli.
 
 package com.example.inventoryservice;
 
-import com.example.inventoryservice.utils.AppConstants;
 import com.example.inventoryservice.config.NonSQLContainersConfig;
 import com.example.inventoryservice.config.SQLContainersConfig;
+import com.example.inventoryservice.utils.AppConstants;
 import org.springframework.boot.SpringApplication;
 
 public class TestInventoryApplication {
diff --git a/inventory-service/src/test/java/com/example/inventoryservice/config/NonSQLContainersConfig.java b/inventory-service/src/test/java/com/example/inventoryservice/config/NonSQLContainersConfig.java
index 819482cf..b433dec5 100644
--- a/inventory-service/src/test/java/com/example/inventoryservice/config/NonSQLContainersConfig.java
+++ b/inventory-service/src/test/java/com/example/inventoryservice/config/NonSQLContainersConfig.java
@@ -33,7 +33,6 @@ GenericContainer<?> zipkContainer() {
     @ServiceConnection
     KafkaContainer kafkaContainer() {
         return new KafkaContainer(DockerImageName.parse("apache/kafka-native").withTag("3.8.1"))
-                .withReuse(true)
-                .waitingFor(Wait.forLogMessage(".*Kafka Server started.*\\n", 1));
+                .withReuse(true);
     }
 }
diff --git a/inventory-service/src/test/java/com/example/inventoryservice/config/SQLContainersConfig.java b/inventory-service/src/test/java/com/example/inventoryservice/config/SQLContainersConfig.java
index 6c680e67..541e13ce 100644
--- a/inventory-service/src/test/java/com/example/inventoryservice/config/SQLContainersConfig.java
+++ b/inventory-service/src/test/java/com/example/inventoryservice/config/SQLContainersConfig.java
@@ -21,7 +21,6 @@ public class SQLContainersConfig {
     PostgreSQLContainer<?> postgreSQLContainer() {
         return new PostgreSQLContainer<>(DockerImageName.parse("postgres:17-alpine"))
                 .withReuse(true)
-                .withCommand("postgres -c fsync=off") // Optimize for tests
                 .withTmpFs(Collections.singletonMap("/var/lib/postgresql/data", "rw"));
     }
 }