diff --git a/README.md b/README.md
index 2ec756f8b4..b84bffc5bf 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ YAS is a pet project aim to practice building a typical microservice application
 
 ## Tentative technologies and frameworks
 
-- Java 17
-- Spring boot 3
+- Java 21
+- Spring boot 3.2
 - Next.js
 - Keycloak
 - Kafka
diff --git a/backoffice-bff/Dockerfile b/backoffice-bff/Dockerfile
index 9acde99634..05aba9f817 100644
--- a/backoffice-bff/Dockerfile
+++ b/backoffice-bff/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-alpine
+FROM openjdk:21-jdk-alpine
 RUN apk add --no-cache bash
 COPY target/backoffice-bff-0.0.1-SNAPSHOT.jar backoffice-bff-0.0.1-SNAPSHOT.jar
 COPY wait-for-it.sh wait-for-it.sh
diff --git a/backoffice-bff/pom.xml b/backoffice-bff/pom.xml
index b59ab073f0..20987aa805 100644
--- a/backoffice-bff/pom.xml
+++ b/backoffice-bff/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yas</groupId>
@@ -14,7 +14,7 @@
 	<name>backoffice-bff</name>
 	<description>Backend for backoffice</description>
 	<properties>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 		<spring-cloud.version>2022.0.3</spring-cloud.version>
         <sonar.organization>nashtech-garage</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -93,29 +93,6 @@
 			</dependency>			
 		</dependencies>
 	</dependencyManagement>
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<url>https://repo.spring.io/snapshot</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<url>https://repo.spring.io/milestone</url>
-		</pluginRepository>
-	</pluginRepositories>
 	<build>
 		<plugins>
 			<plugin>
diff --git a/cart/Dockerfile b/cart/Dockerfile
index 8e37151ad3..9e5202d655 100644
--- a/cart/Dockerfile
+++ b/cart/Dockerfile
@@ -1,3 +1,3 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 ADD target/cart-0.0.1-SNAPSHOT.jar cart-0.0.1-SNAPSHOT.jar
 ENTRYPOINT ["java", "-jar", "/cart-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/cart/pom.xml b/cart/pom.xml
index 01cbdce288..2ce0751304 100644
--- a/cart/pom.xml
+++ b/cart/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yas</groupId>
@@ -14,11 +14,9 @@
 	<description>YAS Cart service</description>
 
 	<properties>
-		<java.version>17</java.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
 		<springdoc-openapi-starter-webmvc-ui.version>2.0.2</springdoc-openapi-starter-webmvc-ui.version>
-		<org.lombok.version>1.18.22</org.lombok.version>
+		<org.lombok.version>1.18.30</org.lombok.version>
 		<org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
 		<spring-cloud.version>2022.0.3</spring-cloud.version>
 		<sonar.organization>nashtech-garage</sonar.organization>
diff --git a/customer/Dockerfile b/customer/Dockerfile
index 437720bb22..8aa7cd2895 100644
--- a/customer/Dockerfile
+++ b/customer/Dockerfile
@@ -1,3 +1,3 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 ADD target/customer-0.0.1-SNAPSHOT.jar customer-0.0.1-SNAPSHOT.jar
 ENTRYPOINT ["java", "-jar", "/customer-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/customer/pom.xml b/customer/pom.xml
index 863ba7cad7..3f8581db56 100644
--- a/customer/pom.xml
+++ b/customer/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yas</groupId>
@@ -14,11 +14,9 @@
 	<description>YAS Customer service</description>
 
 	<properties>
-		<java.version>17</java.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
 		<springdoc-openapi-starter-webmvc-ui.version>2.0.2</springdoc-openapi-starter-webmvc-ui.version>
-		<org.lombok.version>1.18.22</org.lombok.version>
+		<org.lombok.version>1.18.30</org.lombok.version>
 		<spring-cloud.version>2022.0.3</spring-cloud.version>
 		<sonar.organization>nashtech-garage</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
diff --git a/inventory/Dockerfile b/inventory/Dockerfile
index 79e7b7cd6b..a32675994a 100644
--- a/inventory/Dockerfile
+++ b/inventory/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 ADD target/inventory-0.0.1-SNAPSHOT.jar inventory-0.0.1-SNAPSHOT.jar
 ENTRYPOINT ["java", "-jar", "/inventory-0.0.1-SNAPSHOT.jar"]
 
diff --git a/inventory/pom.xml b/inventory/pom.xml
index 50db11f8d0..82c2333a42 100644
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.yas</groupId>
@@ -14,11 +14,9 @@
     <name>inventory</name>
     <description>YAS Inventory Service</description>
     <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>21</java.version>
         <springdoc-openapi-starter-webmvc-ui.version>2.0.2</springdoc-openapi-starter-webmvc-ui.version>
-        <org.lombok.version>1.18.22</org.lombok.version>
+        <org.lombok.version>1.18.30</org.lombok.version>
         <org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
         <spring-cloud.version>2022.0.3</spring-cloud.version>
         <sonar.organization>nashtech-garage</sonar.organization>
diff --git a/location/Dockerfile b/location/Dockerfile
index 77a031ceb5..23c3f2a1d7 100644
--- a/location/Dockerfile
+++ b/location/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 ADD target/location-0.0.1-SNAPSHOT.jar location-0.0.1-SNAPSHOT.jar
 ENTRYPOINT ["java", "-jar", "/location-0.0.1-SNAPSHOT.jar"]
 
diff --git a/location/pom.xml b/location/pom.xml
index f4a760abe7..2ae6c1a1df 100644
--- a/location/pom.xml
+++ b/location/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.yas</groupId>
@@ -14,11 +14,9 @@
     <name>location</name>
     <description>YAS Location Service</description>
     <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>21</java.version>
         <springdoc-openapi-starter-webmvc-ui.version>2.0.2</springdoc-openapi-starter-webmvc-ui.version>
-        <org.lombok.version>1.18.22</org.lombok.version>
+        <org.lombok.version>1.18.30</org.lombok.version>
         <org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
         <spring-cloud.version>2022.0.3</spring-cloud.version>
         <sonar.organization>nashtech-garage</sonar.organization>
diff --git a/media/Dockerfile b/media/Dockerfile
index 45d0dc166f..5109cb8daa 100644
--- a/media/Dockerfile
+++ b/media/Dockerfile
@@ -1,3 +1,3 @@
-FROM openjdk:17-jdk-alpine
+FROM openjdk:21-jdk-alpine
 COPY target/media-0.0.1-SNAPSHOT.jar media-0.0.1-SNAPSHOT.jar
 ENTRYPOINT ["java","-jar","/media-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/media/pom.xml b/media/pom.xml
index cc6fa2f204..b1e4c2e29c 100644
--- a/media/pom.xml
+++ b/media/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yas</groupId>
@@ -13,7 +13,7 @@
 	<name>media</name>
 	<description>Yas Media service</description>
 	<properties>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 		<sonar.organization>nashtech-garage</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
 		<sonar.projectKey>nashtech-garage_yas-media</sonar.projectKey>
diff --git a/order/Dockerfile b/order/Dockerfile
index b5b163942d..0ecbfb6380 100644
--- a/order/Dockerfile
+++ b/order/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 
 ADD target/order-0.0.1-SNAPSHOT.jar order.jar
 ENTRYPOINT ["java", "-jar", "/order.jar"]
\ No newline at end of file
diff --git a/order/pom.xml b/order/pom.xml
index 3f53930c5b..551d4b96b8 100644
--- a/order/pom.xml
+++ b/order/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yas</groupId>
@@ -13,11 +13,9 @@
 	<name>order</name>
 	<description>Order Service for yas project</description>
 	<properties>
-		<java.version>17</java.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
 		<springdoc-openapi-starter-webmvc-ui.version>2.0.2</springdoc-openapi-starter-webmvc-ui.version>
-		<org.lombok.version>1.18.22</org.lombok.version>
+		<org.lombok.version>1.18.30</org.lombok.version>
 		<org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
 		<spring-cloud.version>2022.0.3</spring-cloud.version>
 		<sonar.organization>nashtech-garage</sonar.organization>
diff --git a/payment-paypal/Dockerfile b/payment-paypal/Dockerfile
index 5045b2ee5a..80a74c23eb 100644
--- a/payment-paypal/Dockerfile
+++ b/payment-paypal/Dockerfile
@@ -1,3 +1,3 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 ADD target/payment-paypal-0.0.1-SNAPSHOT.jar payment-paypal-0.0.1-SNAPSHOT.jar
 ENTRYPOINT ["java", "-jar", "/payment-paypal-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/payment-paypal/pom.xml b/payment-paypal/pom.xml
index dd504d37c0..4266c1d756 100644
--- a/payment-paypal/pom.xml
+++ b/payment-paypal/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yas</groupId>
@@ -14,11 +14,9 @@
 	<name>payment-paypal</name>
 	<description>Payment with paypal service for yas project</description>
 	<properties>
-		<java.version>17</java.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
 		<springdoc-openapi-starter-webmvc-ui.version>2.0.2</springdoc-openapi-starter-webmvc-ui.version>
-		<org.lombok.version>1.18.22</org.lombok.version>
+		<org.lombok.version>1.18.30</org.lombok.version>
 		<org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
 		<spring-cloud.version>2022.0.3</spring-cloud.version>
 		<sonar.organization>nashtech-garage</sonar.organization>
diff --git a/payment/Dockerfile b/payment/Dockerfile
index def98bcafe..03c01c197d 100644
--- a/payment/Dockerfile
+++ b/payment/Dockerfile
@@ -1,3 +1,3 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 ADD target/payment-0.0.1-SNAPSHOT.jar payment-0.0.1-SNAPSHOT.jar
 ENTRYPOINT ["java", "-jar", "/payment-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/payment/pom.xml b/payment/pom.xml
index 9ef350edb0..a9a42b0c35 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yas</groupId>
@@ -13,11 +13,9 @@
 	<name>payment</name>
 	<description>Payment Service for Yas Project</description>
 	<properties>
-		<java.version>17</java.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
 		<springdoc-openapi-starter-webmvc-ui.version>2.0.2</springdoc-openapi-starter-webmvc-ui.version>
-		<org.lombok.version>1.18.22</org.lombok.version>
+		<org.lombok.version>1.18.30</org.lombok.version>
 		<org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
 		<spring-cloud.version>2022.0.3</spring-cloud.version>
 		<sonar.organization>nashtech-garage</sonar.organization>
diff --git a/product/Dockerfile b/product/Dockerfile
index 4d651fa871..998f12a2a4 100644
--- a/product/Dockerfile
+++ b/product/Dockerfile
@@ -1,3 +1,3 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 ADD target/product-0.0.1-SNAPSHOT.jar product-0.0.1-SNAPSHOT.jar
 ENTRYPOINT ["java", "-jar", "/product-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/product/pom.xml b/product/pom.xml
index a0cc7e109a..a3e3e57064 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yas</groupId>
@@ -15,12 +15,10 @@
 	<description>YAS Product service</description>
 
 	<properties>
-		<java.version>17</java.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
 		<springdoc-openapi-starter-webmvc-ui.version>2.0.4</springdoc-openapi-starter-webmvc-ui.version>
 		<spring-boot-devtools.version>3.1.0</spring-boot-devtools.version>
-		<org.lombok.version>1.18.22</org.lombok.version>
+		<lombok.version>1.18.30</lombok.version>
 		<spring-cloud.version>2022.0.3</spring-cloud.version>
 		<sonar.organization>nashtech-garage</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -148,6 +146,11 @@
 							<artifactId>lombok</artifactId>
 							<version>${lombok.version}</version>
 						</path>
+						<path>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok-mapstruct-binding</artifactId>
+							<version>0.2.0</version>
+						</path>
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
diff --git a/promotion/Dockerfile b/promotion/Dockerfile
index 7e84f0ba33..f1b28b72f3 100644
--- a/promotion/Dockerfile
+++ b/promotion/Dockerfile
@@ -1,3 +1,3 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 ADD target/promotion-0.0.1-SNAPSHOT.jar promotion-0.0.1-SNAPSHOT.jar
 ENTRYPOINT ["java", "-jar", "/promotion-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/promotion/pom.xml b/promotion/pom.xml
index 63602b8e2c..621a82e891 100644
--- a/promotion/pom.xml
+++ b/promotion/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yas</groupId>
@@ -14,11 +14,9 @@
 	<name>promotion</name>
 	<description>YAS Promotion Service</description>
 	<properties>
-		<java.version>17</java.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
 		<springdoc-openapi-starter-webmvc-ui.version>2.0.2</springdoc-openapi-starter-webmvc-ui.version>
-		<org.lombok.version>1.18.22</org.lombok.version>
+		<org.lombok.version>1.18.30</org.lombok.version>
 		<org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
 		<spring-cloud.version>2022.0.3</spring-cloud.version>
 		<sonar.organization>nashtech-garage</sonar.organization>
diff --git a/rating/Dockerfile b/rating/Dockerfile
index 99d2d0b9ef..89afc204a4 100644
--- a/rating/Dockerfile
+++ b/rating/Dockerfile
@@ -1,3 +1,3 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 ADD target/rating-0.0.1-SNAPSHOT.jar rating-0.0.1-SNAPSHOT.jar
 ENTRYPOINT ["java", "-jar", "/rating-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/rating/pom.xml b/rating/pom.xml
index bef8475611..af06f4a690 100644
--- a/rating/pom.xml
+++ b/rating/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yas</groupId>
@@ -13,11 +13,9 @@
 	<name>rating</name>
 	<description>YAS Rating service</description>
 	<properties>
-		<java.version>17</java.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
 		<springdoc-openapi-starter-webmvc-ui.version>2.0.2</springdoc-openapi-starter-webmvc-ui.version>
-		<org.lombok.version>1.18.22</org.lombok.version>
+		<org.lombok.version>1.18.30</org.lombok.version>
 		<org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
 		<spring-cloud.version>2022.0.3</spring-cloud.version>
 		<sonar.organization>nashtech-garage</sonar.organization>
diff --git a/saga/pom.xml b/saga/pom.xml
index bde99273f3..68a00bff2a 100644
--- a/saga/pom.xml
+++ b/saga/pom.xml
@@ -8,10 +8,10 @@
     <name>saga</name>
     <description>Saga model common yas project</description>
     <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <org.lombok.version>1.18.26</org.lombok.version>
+        <java.version>21</java.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <org.lombok.version>1.18.30</org.lombok.version>
         <org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
         <eventuate-platform.version>2023.0.RELEASE</eventuate-platform.version>
     </properties>
diff --git a/search/Dockerfile b/search/Dockerfile
index 18d698235a..cbbba406ef 100644
--- a/search/Dockerfile
+++ b/search/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 RUN apk add --no-cache bash
 ADD target/search-0.0.1-SNAPSHOT.jar search-0.0.1-SNAPSHOT.jar
 COPY wait-for-it.sh wait-for-it.sh
diff --git a/search/pom.xml b/search/pom.xml
index 5ed4ea6417..7f4e2db8eb 100644
--- a/search/pom.xml
+++ b/search/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
@@ -14,11 +14,9 @@
 	<name>search</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<java.version>17</java.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
 		<springdoc-openapi-starter-webmvc-ui.version>2.0.2</springdoc-openapi-starter-webmvc-ui.version>
-		<org.lombok.version>1.18.22</org.lombok.version>
+		<org.lombok.version>1.18.30</org.lombok.version>
 		<org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
 		<spring-cloud.version>2022.0.3</spring-cloud.version>
 		<sonar.organization>nashtech-garage</sonar.organization>
diff --git a/storefront-bff/Dockerfile b/storefront-bff/Dockerfile
index 884e98f4a0..e002c9c1e2 100644
--- a/storefront-bff/Dockerfile
+++ b/storefront-bff/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-alpine
+FROM openjdk:21-jdk-alpine
 RUN apk add --no-cache bash
 COPY wait-for-it.sh wait-for-it.sh
 RUN chmod +x wait-for-it.sh
diff --git a/storefront-bff/pom.xml b/storefront-bff/pom.xml
index 5d3834e13a..8bc1b0e6f0 100644
--- a/storefront-bff/pom.xml
+++ b/storefront-bff/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0</version>
+		<version>3.2.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yas</groupId>
@@ -14,7 +14,7 @@
 	<name>storefront-bff</name>
 	<description>Back end for Storefront</description>
 	<properties>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 		<spring-cloud.version>2022.0.3</spring-cloud.version>
 		<sonar.organization>nashtech-garage</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
diff --git a/tax/Dockerfile b/tax/Dockerfile
index 74bfcf35fd..7e988f7385 100644
--- a/tax/Dockerfile
+++ b/tax/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 ADD target/tax-0.0.1-SNAPSHOT.jar tax-0.0.1-SNAPSHOT.jar
 ENTRYPOINT ["java", "-jar", "/tax-0.0.1-SNAPSHOT.jar"]
 
diff --git a/tax/pom.xml b/tax/pom.xml
index db974d52f0..28a18ccc42 100644
--- a/tax/pom.xml
+++ b/tax/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.yas</groupId>
@@ -14,11 +14,9 @@
     <name>tax</name>
     <description>YAS Tax Service</description>
     <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>21</java.version>
         <springdoc-openapi-starter-webmvc-ui.version>2.0.2</springdoc-openapi-starter-webmvc-ui.version>
-        <org.lombok.version>1.18.22</org.lombok.version>
+        <org.lombok.version>1.18.30</org.lombok.version>
         <org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
         <spring-cloud.version>2022.0.3</spring-cloud.version>
         <sonar.organization>nashtech-garage</sonar.organization>