diff --git a/monolith/pom.xml b/monolith/pom.xml
index ea80738..7298b9a 100644
--- a/monolith/pom.xml
+++ b/monolith/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>3.4.5</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.javieraviles</groupId>
@@ -16,7 +16,7 @@
 	<description>Monolith handling orders, customers and products</description>
 
 	<properties>
-		<java.version>11</java.version>
+		<java.version>21</java.version>
 	</properties>
 
 	<dependencies>
@@ -28,6 +28,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -41,19 +45,13 @@
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
+			<groupId>org.apache.httpcomponents.client5</groupId>
+			<artifactId>httpclient5</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.junit.vintage</groupId>
-					<artifactId>junit-vintage-engine</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 	</dependencies>
 
diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/SplitTheMonolithApplication.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/SplitTheMonolithApplication.java
index 2dad801..bb9d047 100644
--- a/monolith/src/main/java/com/javieraviles/splitthemonolith/SplitTheMonolithApplication.java
+++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/SplitTheMonolithApplication.java
@@ -3,8 +3,8 @@
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/RfqDto.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/RfqDto.java
index c36ec60..fcee6ea 100644
--- a/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/RfqDto.java
+++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/RfqDto.java
@@ -3,8 +3,8 @@
 import java.math.BigDecimal;
 import java.time.Instant;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Positive;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
 
 import com.javieraviles.splitthemonolith.entity.RfqStatus;
 import com.javieraviles.splitthemonolith.entity.Side;
diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/TradeConfirmationDto.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/TradeConfirmationDto.java
index 6f4c345..cfe29e9 100644
--- a/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/TradeConfirmationDto.java
+++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/TradeConfirmationDto.java
@@ -2,7 +2,7 @@
 
 import java.math.BigDecimal;
 
-import javax.validation.constraints.Positive;
+import jakarta.validation.constraints.Positive;
 
 public class TradeConfirmationDto {
 
diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Bond.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Bond.java
index 9504e16..8454ec2 100644
--- a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Bond.java
+++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Bond.java
@@ -3,12 +3,12 @@
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.validation.constraints.PositiveOrZero;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.PositiveOrZero;
 
 import com.javieraviles.splitthemonolith.exception.InsufficientNotionalException;
 
diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Counterparty.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Counterparty.java
index de7aedc..b247879 100644
--- a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Counterparty.java
+++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Counterparty.java
@@ -2,14 +2,14 @@
 
 import java.math.BigDecimal;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.PrePersist;
-import javax.validation.constraints.PositiveOrZero;
-import javax.validation.constraints.Size;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.PrePersist;
+import jakarta.validation.constraints.PositiveOrZero;
+import jakarta.validation.constraints.Size;
 
 import com.javieraviles.splitthemonolith.exception.InsufficientCreditException;
 
diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Rfq.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Rfq.java
index e90d630..01df1cd 100644
--- a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Rfq.java
+++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Rfq.java
@@ -3,19 +3,19 @@
 import java.math.BigDecimal;
 import java.time.Instant;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.PrePersist;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Positive;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.PrePersist;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
 
 @Entity(name = "rfqs")
 public class Rfq {