diff --git a/.java-version b/.java-version
new file mode 100644
index 00000000..baf3ee04
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+21.0.5
diff --git a/department-service/pom.xml b/department-service/pom.xml
index 51b40fff..f3a611bd 100644
--- a/department-service/pom.xml
+++ b/department-service/pom.xml
@@ -64,8 +64,8 @@
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
-            <version>2.8.3</version>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>${spring-openai-mvc.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/employee-service/pom.xml b/employee-service/pom.xml
index e6d2d8b1..985c0653 100644
--- a/employee-service/pom.xml
+++ b/employee-service/pom.xml
@@ -56,8 +56,8 @@
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
-            <version>2.8.3</version>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>${spring-openai-mvc.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/gateway-service/pom.xml b/gateway-service/pom.xml
index 286ba476..f18101ec 100644
--- a/gateway-service/pom.xml
+++ b/gateway-service/pom.xml
@@ -38,15 +38,10 @@
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-exporter-zipkin</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webflux-api</artifactId>
-            <version>2.8.3</version>
-        </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
-            <version>2.8.3</version>
+            <version>${spring-openai-flux.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/gateway-service/src/main/java/pl/piomin/services/gateway/GatewayApplication.java b/gateway-service/src/main/java/pl/piomin/services/gateway/GatewayApplication.java
index 2eeff7c6..43d95f26 100644
--- a/gateway-service/src/main/java/pl/piomin/services/gateway/GatewayApplication.java
+++ b/gateway-service/src/main/java/pl/piomin/services/gateway/GatewayApplication.java
@@ -2,8 +2,9 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springdoc.core.properties.AbstractSwaggerUiConfigProperties;
-import org.springdoc.core.properties.SwaggerUiConfigParameters;
+import org.springdoc.core.properties.AbstractSwaggerUiConfigProperties.SwaggerUrl;
+import org.springdoc.core.properties.SwaggerUiConfigProperties;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -16,6 +17,9 @@
 import java.util.List;
 import java.util.Set;
 
+import static org.springdoc.core.utils.Constants.DEFAULT_API_DOCS_URL;
+
+
 @SpringBootApplication
 @EnableDiscoveryClient
 public class GatewayApplication {
@@ -28,16 +32,15 @@ public static void main(String[] args) {
 
 	@Bean
 	@Lazy(false)
-	public Set<AbstractSwaggerUiConfigProperties.SwaggerUrl> apis(RouteDefinitionLocator locator,
-																  SwaggerUiConfigParameters swaggerUiConfigParameters) {
-		Set<AbstractSwaggerUiConfigProperties.SwaggerUrl> urls = new HashSet<>();
+	public Set<SwaggerUrl> apis(RouteDefinitionLocator locator, SwaggerUiConfigProperties swaggerUiConfigProperties) {
+		Set<SwaggerUrl> urls = new HashSet<>();
 		List<RouteDefinition> definitions = locator.getRouteDefinitions().collectList().block();
 		definitions.stream().filter(routeDefinition -> routeDefinition.getId().matches(".*-service")).forEach(routeDefinition -> {
 			String name = routeDefinition.getId().replaceAll("-service", "");
-			AbstractSwaggerUiConfigProperties.SwaggerUrl swaggerUrl = new AbstractSwaggerUiConfigProperties.SwaggerUrl(name, "/" + name, null);
+			SwaggerUrl swaggerUrl = new SwaggerUrl(name, DEFAULT_API_DOCS_URL+"/" + name, null);
 			urls.add(swaggerUrl);
 		});
-		swaggerUiConfigParameters.setUrls(urls);
+		swaggerUiConfigProperties.setUrls(urls);
 		return urls;
 	}
 
diff --git a/organization-service/pom.xml b/organization-service/pom.xml
index 7e1c32b1..0b584c1e 100644
--- a/organization-service/pom.xml
+++ b/organization-service/pom.xml
@@ -44,8 +44,8 @@
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
-            <version>2.8.3</version>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>${spring-openai-mvc.version}</version>
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
diff --git a/pom.xml b/pom.xml
index 34333cce..5e9fbc1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.1</version>
         <relativePath />
     </parent>
 
@@ -16,7 +16,9 @@
 
     <properties>
         <java.version>21</java.version>
-        <spring-cloud.version>2023.0.5</spring-cloud.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
+        <spring-openai-mvc.version>2.8.3</spring-openai-mvc.version>
+        <spring-openai-flux.version>2.8.3</spring-openai-flux.version>
         <sonar.projectKey>piomin_sample-spring-microservices-new</sonar.projectKey>
         <sonar.organization>piomin</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>