diff --git a/billy-andorra/pom.xml b/billy-andorra/pom.xml
index 7a6c695f3..b474dd65c 100644
--- a/billy-andorra/pom.xml
+++ b/billy-andorra/pom.xml
@@ -50,12 +50,12 @@
 
 		<!-- PERSISTENCE -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-envers</artifactId>
 		</dependency>
 
@@ -64,6 +64,7 @@
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-jpa</artifactId>
 			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
 			<scope>provided</scope>
 		</dependency>
 
@@ -169,6 +170,7 @@
 						<groupId>com.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
 						<version>${querydsl.version}</version>
+						<classifier>jakarta</classifier>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/AndorraPersistenceDependencyModule.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/AndorraPersistenceDependencyModule.java
index 3256b7186..1992afaa1 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/AndorraPersistenceDependencyModule.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/AndorraPersistenceDependencyModule.java
@@ -22,6 +22,7 @@
 import com.google.inject.Inject;
 import com.google.inject.persist.PersistService;
 import com.google.inject.persist.jpa.JpaPersistModule;
+import com.google.inject.persist.jpa.JpaPersistOptions;
 
 public class AndorraPersistenceDependencyModule extends AbstractModule {
 
@@ -33,7 +34,8 @@ public AndorraPersistenceDependencyModule(String persistenceUnitId) {
 
     @Override
     protected void configure() {
-        JpaPersistModule persistModule = new JpaPersistModule(this.persistenceUnitId);
+        final var options = JpaPersistOptions.builder().setAutoBeginWorkOnEntityManagerCreation(true).build();
+        JpaPersistModule persistModule = new JpaPersistModule(this.persistenceUnitId, options);
         this.install(persistModule);
     }
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/BillyAndorra.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/BillyAndorra.java
index 7c8eb77cc..5a9ccdc8d 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/BillyAndorra.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/BillyAndorra.java
@@ -32,8 +32,8 @@
 import com.premiumminds.billy.andorra.util.Receipts;
 import com.premiumminds.billy.andorra.util.SimpleInvoices;
 import com.premiumminds.billy.andorra.util.Taxes;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/AbstractDAOADGenericInvoiceEntryImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/AbstractDAOADGenericInvoiceEntryImpl.java
index 975c55e41..64cb78211 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/AbstractDAOADGenericInvoiceEntryImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/AbstractDAOADGenericInvoiceEntryImpl.java
@@ -20,9 +20,9 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADGenericInvoiceEntryEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADGenericInvoiceEntryEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.AbstractDAOGenericInvoiceEntryImpl;
 import com.premiumminds.billy.andorra.persistence.dao.AbstractDAOADGenericInvoiceEntry;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/AbstractDAOADGenericInvoiceImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/AbstractDAOADGenericInvoiceImpl.java
index 3a778e1d0..2d4e5af11 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/AbstractDAOADGenericInvoiceImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/AbstractDAOADGenericInvoiceImpl.java
@@ -22,9 +22,9 @@
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADGenericInvoiceEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.QJPAADBusinessEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.QJPAADGenericInvoiceEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADAddressImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADAddressImpl.java
index 0e719d432..05de3c6b0 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADAddressImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADAddressImpl.java
@@ -20,9 +20,9 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADAddressEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADAddressEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOAddressImpl;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADAddress;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADApplicationImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADApplicationImpl.java
index b7eec9b46..de801898e 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADApplicationImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADApplicationImpl.java
@@ -19,10 +19,10 @@
 package com.premiumminds.billy.andorra.persistence.dao.jpa;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADApplicationEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Application;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADBusinessImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADBusinessImpl.java
index d43f23253..9a6cc7a71 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADBusinessImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADBusinessImpl.java
@@ -19,10 +19,10 @@
 package com.premiumminds.billy.andorra.persistence.dao.jpa;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADBusinessEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADContactImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADContactImpl.java
index 69acb51dc..1a333e389 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADContactImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADContactImpl.java
@@ -19,9 +19,9 @@
 package com.premiumminds.billy.andorra.persistence.dao.jpa;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADContactEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOContactImpl;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADContact;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditNoteEntryImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditNoteEntryImpl.java
index 17346347c..178f5ecc4 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditNoteEntryImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditNoteEntryImpl.java
@@ -24,9 +24,9 @@
 import com.premiumminds.billy.andorra.persistence.entities.jpa.QJPAADCreditNoteEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.QJPAADCreditNoteEntryEntity;
 import com.premiumminds.billy.andorra.services.entities.ADInvoice;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADCreditNoteEntry;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADCreditNoteEntity;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditNoteImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditNoteImpl.java
index b5a3a559c..7506ebef1 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditNoteImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditNoteImpl.java
@@ -26,9 +26,9 @@
 import com.premiumminds.billy.andorra.services.entities.ADCreditNote;
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditReceiptEntryImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditReceiptEntryImpl.java
index be213209a..02c9bb7c7 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditReceiptEntryImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditReceiptEntryImpl.java
@@ -23,9 +23,9 @@
 import com.premiumminds.billy.andorra.persistence.entities.jpa.QJPAADCreditReceiptEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.QJPAADCreditReceiptEntryEntity;
 import com.premiumminds.billy.andorra.services.entities.ADReceipt;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADCreditReceiptEntry;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADCreditReceiptEntity;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditReceiptImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditReceiptImpl.java
index dc2bc67d1..e804d11b7 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditReceiptImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCreditReceiptImpl.java
@@ -33,9 +33,9 @@
 import com.querydsl.jpa.JPQLQuery;
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 public class DAOADCreditReceiptImpl extends AbstractDAOADGenericInvoiceImpl<ADCreditReceiptEntity, JPAADCreditReceiptEntity>
     implements DAOADCreditReceipt
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCustomerImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCustomerImpl.java
index 8364e8400..a6b8d3dcf 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCustomerImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADCustomerImpl.java
@@ -19,9 +19,9 @@
 package com.premiumminds.billy.andorra.persistence.dao.jpa;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADCustomerEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOCustomerImpl;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADCustomer;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADGenericInvoiceEntryImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADGenericInvoiceEntryImpl.java
index 468ffef94..f383a2a6a 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADGenericInvoiceEntryImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADGenericInvoiceEntryImpl.java
@@ -20,9 +20,9 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADGenericInvoiceEntryEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADGenericInvoiceEntryEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADGenericInvoiceEntry;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADGenericInvoiceImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADGenericInvoiceImpl.java
index 36cf4c264..2a3b45564 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADGenericInvoiceImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADGenericInvoiceImpl.java
@@ -20,9 +20,9 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADGenericInvoiceEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADGenericInvoiceEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADGenericInvoice;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADInvoiceEntryImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADInvoiceEntryImpl.java
index c2654a510..19d72ea83 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADInvoiceEntryImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADInvoiceEntryImpl.java
@@ -19,9 +19,9 @@
 package com.premiumminds.billy.andorra.persistence.dao.jpa;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADInvoiceEntryEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADInvoiceEntry;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADInvoiceEntryEntity;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADInvoiceImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADInvoiceImpl.java
index 50348b81b..7275f3a75 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADInvoiceImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADInvoiceImpl.java
@@ -19,9 +19,9 @@
 package com.premiumminds.billy.andorra.persistence.dao.jpa;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADInvoiceEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADInvoice;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADInvoiceEntity;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADPaymentImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADPaymentImpl.java
index 8e899db07..993749565 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADPaymentImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADPaymentImpl.java
@@ -19,9 +19,9 @@
 package com.premiumminds.billy.andorra.persistence.dao.jpa;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADPaymentEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOPaymentImpl;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADPayment;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADProductImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADProductImpl.java
index 55cb6453c..13786201b 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADProductImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADProductImpl.java
@@ -20,9 +20,9 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADProductEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADProductEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOProductImpl;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADProduct;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADReceiptEntryImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADReceiptEntryImpl.java
index 012e50f69..685ad35f6 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADReceiptEntryImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADReceiptEntryImpl.java
@@ -20,9 +20,9 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADReceiptEntryEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADReceiptEntryEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADReceiptEntry;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADReceiptImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADReceiptImpl.java
index b7161cf6d..325c81036 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADReceiptImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADReceiptImpl.java
@@ -19,9 +19,9 @@
 package com.premiumminds.billy.andorra.persistence.dao.jpa;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADReceiptEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADReceipt;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADReceiptEntity;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADRegionContextImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADRegionContextImpl.java
index 0a6d9b0c9..6f3ca5f2d 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADRegionContextImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADRegionContextImpl.java
@@ -20,9 +20,9 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADRegionContextEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADRegionContextEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOContextImpl;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADRegionContext;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADShippingPointImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADShippingPointImpl.java
index d6fabc427..84a257d9b 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADShippingPointImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADShippingPointImpl.java
@@ -20,9 +20,9 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADShippingPointEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADShippingPointEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOShippingPointImpl;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADShippingPoint;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADSimpleInvoiceImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADSimpleInvoiceImpl.java
index f87beaf67..6bd3ab970 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADSimpleInvoiceImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADSimpleInvoiceImpl.java
@@ -20,9 +20,9 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADSimpleInvoiceEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADSimpleInvoiceEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADSimpleInvoice;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADSupplierImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADSupplierImpl.java
index acdd6b8cb..bd21c83fe 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADSupplierImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADSupplierImpl.java
@@ -20,9 +20,9 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADSupplierEntity;
 import com.premiumminds.billy.andorra.persistence.entities.jpa.JPAADSupplierEntity;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOSupplierImpl;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADSupplier;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADTaxImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADTaxImpl.java
index 694a51e47..c61148111 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADTaxImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/dao/jpa/DAOADTaxImpl.java
@@ -27,9 +27,9 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOTaxImpl;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADTax;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADAddressEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADAddressEntity.java
index 852f248ec..1a8744e87 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADAddressEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADAddressEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.andorra.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADApplicationEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADApplicationEntity.java
index 9c81d3739..bef9597c5 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADApplicationEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADApplicationEntity.java
@@ -22,8 +22,8 @@
 import com.premiumminds.billy.andorra.persistence.entities.ADApplicationEntity;
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADBusinessEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADBusinessEntity.java
index a360307ee..51fa53eaa 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADBusinessEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADBusinessEntity.java
@@ -20,8 +20,8 @@
 
 import com.premiumminds.billy.andorra.Config;
 import com.premiumminds.billy.andorra.persistence.entities.ADBusinessEntity;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADContactEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADContactEntity.java
index 12cd0092c..52333053b 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADContactEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADContactEntity.java
@@ -20,8 +20,8 @@
 
 import com.premiumminds.billy.andorra.Config;
 import com.premiumminds.billy.andorra.persistence.entities.ADContactEntity;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditNoteEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditNoteEntity.java
index ecbfcec1f..2cfef3727 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditNoteEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditNoteEntity.java
@@ -23,8 +23,8 @@
 import com.premiumminds.billy.andorra.services.entities.ADCreditNoteEntry;
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditNoteEntryEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditNoteEntryEntity.java
index 2c7753831..13d8644ac 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditNoteEntryEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditNoteEntryEntity.java
@@ -18,13 +18,13 @@
  */
 package com.premiumminds.billy.andorra.persistence.entities.jpa;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditReceiptEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditReceiptEntity.java
index 45dbe19ba..e2bdd5d87 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditReceiptEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditReceiptEntity.java
@@ -23,8 +23,8 @@
 import com.premiumminds.billy.andorra.services.entities.ADCreditReceiptEntry;
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditReceiptEntryEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditReceiptEntryEntity.java
index c1084b070..aeb0695d9 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditReceiptEntryEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCreditReceiptEntryEntity.java
@@ -21,13 +21,13 @@
 import com.premiumminds.billy.andorra.Config;
 import com.premiumminds.billy.andorra.persistence.entities.ADCreditReceiptEntryEntity;
 import com.premiumminds.billy.andorra.services.entities.ADReceipt;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCustomerEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCustomerEntity.java
index 11d6bc99a..d2ec04099 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCustomerEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADCustomerEntity.java
@@ -20,9 +20,9 @@
 
 import com.premiumminds.billy.andorra.Config;
 import com.premiumminds.billy.andorra.persistence.entities.ADCustomerEntity;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADGenericInvoiceEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADGenericInvoiceEntity.java
index 97e8dd783..3cf8959dc 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADGenericInvoiceEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADGenericInvoiceEntity.java
@@ -20,9 +20,9 @@
 
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADGenericInvoiceEntryEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADGenericInvoiceEntryEntity.java
index 23a8e3695..c20ee7733 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADGenericInvoiceEntryEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADGenericInvoiceEntryEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.andorra.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADInvoiceEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADInvoiceEntity.java
index 24abfe180..78c807d72 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADInvoiceEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADInvoiceEntity.java
@@ -24,10 +24,10 @@
 import com.premiumminds.billy.andorra.services.entities.ADPayment;
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADInvoiceEntryEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADInvoiceEntryEntity.java
index 27b8e0388..c54001065 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADInvoiceEntryEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADInvoiceEntryEntity.java
@@ -20,8 +20,8 @@
 
 import com.premiumminds.billy.andorra.Config;
 import com.premiumminds.billy.andorra.persistence.entities.ADInvoiceEntryEntity;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADPaymentEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADPaymentEntity.java
index 000269341..5f80dbe2b 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADPaymentEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADPaymentEntity.java
@@ -22,9 +22,9 @@
 import com.premiumminds.billy.andorra.persistence.entities.ADPaymentEntity;
 import java.math.BigDecimal;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADProductEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADProductEntity.java
index 1151c5e45..1bf11d342 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADProductEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADProductEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.andorra.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADReceiptEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADReceiptEntity.java
index eba6fc009..8d7c947c6 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADReceiptEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADReceiptEntity.java
@@ -24,10 +24,10 @@
 import com.premiumminds.billy.andorra.services.entities.ADReceiptEntry;
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADReceiptEntryEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADReceiptEntryEntity.java
index 081408a2a..7029d84d3 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADReceiptEntryEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADReceiptEntryEntity.java
@@ -18,10 +18,10 @@
  */
 package com.premiumminds.billy.andorra.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADRegionContextEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADRegionContextEntity.java
index 8dfc662cd..d52e0010f 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADRegionContextEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADRegionContextEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.andorra.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADShippingPointEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADShippingPointEntity.java
index d5406a25d..191c4c964 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADShippingPointEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADShippingPointEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.andorra.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADSimpleInvoiceEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADSimpleInvoiceEntity.java
index 71b2191ac..3da9855d4 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADSimpleInvoiceEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADSimpleInvoiceEntity.java
@@ -20,9 +20,9 @@
 
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADSupplierEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADSupplierEntity.java
index 215f3f048..6a939682f 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADSupplierEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADSupplierEntity.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.andorra.persistence.entities.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADTaxEntity.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADTaxEntity.java
index eca9dcc3e..b4860f173 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADTaxEntity.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/persistence/entities/jpa/JPAADTaxEntity.java
@@ -20,8 +20,8 @@
 
 import com.premiumminds.billy.andorra.Config;
 import com.premiumminds.billy.andorra.persistence.entities.ADTaxEntity;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADAddressBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADAddressBuilderImpl.java
index ea2ae2b54..68026631b 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADAddressBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADAddressBuilderImpl.java
@@ -20,7 +20,7 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADAddressEntity;
 import com.premiumminds.billy.andorra.services.entities.ADAddress;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.AddressBuilderImpl;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADApplicationBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADApplicationBuilderImpl.java
index 0bfe8690e..625f99b92 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADApplicationBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADApplicationBuilderImpl.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.builders.impl;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADApplicationEntity;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ApplicationBuilderImpl;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADBusinessBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADBusinessBuilderImpl.java
index abf1e6df7..ae2c09708 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADBusinessBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADBusinessBuilderImpl.java
@@ -32,7 +32,7 @@
 import com.premiumminds.billy.core.util.Localizer;
 import com.premiumminds.billy.core.util.NotOnUpdate;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADContactBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADContactBuilderImpl.java
index f52b0462d..3cd96d23e 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADContactBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADContactBuilderImpl.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.builders.impl;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADContactEntity;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ContactBuilderImpl;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADCustomerBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADCustomerBuilderImpl.java
index e6ba22388..80045d72e 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADCustomerBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADCustomerBuilderImpl.java
@@ -20,7 +20,7 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADCustomerEntity;
 import com.premiumminds.billy.andorra.util.ADFinancialValidator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.exceptions.InvalidTaxIdentificationNumberException;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADInvoiceEntryBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADInvoiceEntryBuilderImpl.java
index 105747bed..550e7332f 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADInvoiceEntryBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADInvoiceEntryBuilderImpl.java
@@ -30,7 +30,7 @@
 import com.premiumminds.billy.andorra.persistence.dao.DAOADTax;
 import com.premiumminds.billy.andorra.services.builders.ADInvoiceEntryBuilder;
 import com.premiumminds.billy.andorra.services.entities.ADInvoiceEntry;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class ADInvoiceEntryBuilderImpl<TBuilder extends ADInvoiceEntryBuilderImpl<TBuilder, TEntry>,
     TEntry extends ADInvoiceEntry>
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADPaymentBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADPaymentBuilderImpl.java
index 6ea1f70cb..5a3cee643 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADPaymentBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADPaymentBuilderImpl.java
@@ -21,7 +21,7 @@
 import java.math.BigDecimal;
 import java.util.Date;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.PaymentBuilderImpl;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADProductBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADProductBuilderImpl.java
index 772d754f1..ce5379462 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADProductBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADProductBuilderImpl.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.builders.impl;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADProductEntity;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ProductBuilderImpl;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADRegionContextBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADRegionContextBuilderImpl.java
index e7ac9fdc2..8715fe504 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADRegionContextBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADRegionContextBuilderImpl.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.builders.impl;
 
 import com.premiumminds.billy.andorra.persistence.entities.ADRegionContextEntity;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.builders.impl.ContextBuilderImpl;
 import com.premiumminds.billy.core.util.Localizer;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADShippingPointBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADShippingPointBuilderImpl.java
index a7806bb81..229c92b8c 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADShippingPointBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADShippingPointBuilderImpl.java
@@ -21,7 +21,7 @@
 import com.premiumminds.billy.andorra.persistence.entities.ADShippingPointEntity;
 import com.premiumminds.billy.andorra.services.builders.ADShippingPointBuilder;
 import com.premiumminds.billy.andorra.services.entities.ADShippingPoint;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ShippingPointBuilderImpl;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADSupplierBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADSupplierBuilderImpl.java
index 232874066..dfae0e1c7 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADSupplierBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADSupplierBuilderImpl.java
@@ -21,7 +21,7 @@
 import com.premiumminds.billy.andorra.persistence.entities.ADSupplierEntity;
 import com.premiumminds.billy.andorra.services.entities.ADSupplier;
 import com.premiumminds.billy.andorra.util.ADFinancialValidator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.exceptions.InvalidTaxIdentificationNumberException;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADTaxBuilderImpl.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADTaxBuilderImpl.java
index 072a1a3fd..85bf4a787 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADTaxBuilderImpl.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/builders/impl/ADTaxBuilderImpl.java
@@ -21,7 +21,7 @@
 import com.premiumminds.billy.andorra.persistence.entities.ADTaxEntity;
 import com.premiumminds.billy.andorra.services.entities.ADTax;
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.TaxBuilderImpl;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADCreditNoteIssuingHandler.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADCreditNoteIssuingHandler.java
index 23a6ca691..8c9a686aa 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADCreditNoteIssuingHandler.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADCreditNoteIssuingHandler.java
@@ -22,7 +22,7 @@
 import com.premiumminds.billy.andorra.persistence.entities.ADCreditNoteEntity;
 import com.premiumminds.billy.andorra.services.documents.util.ADIssuingParams;
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADCreditReceiptIssuingHandler.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADCreditReceiptIssuingHandler.java
index 296010cca..255a202f7 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADCreditReceiptIssuingHandler.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADCreditReceiptIssuingHandler.java
@@ -22,7 +22,7 @@
 import com.premiumminds.billy.andorra.persistence.entities.ADCreditReceiptEntity;
 import com.premiumminds.billy.andorra.services.documents.util.ADIssuingParams;
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADGenericInvoiceIssuingHandler.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADGenericInvoiceIssuingHandler.java
index 6f0c5d8d3..038bae8c4 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADGenericInvoiceIssuingHandler.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADGenericInvoiceIssuingHandler.java
@@ -23,8 +23,8 @@
 import java.util.Date;
 
 import java.util.Optional;
-import javax.inject.Inject;
-import javax.persistence.LockModeType;
+import jakarta.inject.Inject;
+import jakarta.persistence.LockModeType;
 
 import com.premiumminds.billy.core.persistence.dao.AbstractDAOGenericInvoice;
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADInvoiceIssuingHandler.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADInvoiceIssuingHandler.java
index 33db7d961..59a0e6713 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADInvoiceIssuingHandler.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADInvoiceIssuingHandler.java
@@ -22,7 +22,7 @@
 import com.premiumminds.billy.andorra.persistence.entities.ADInvoiceEntity;
 import com.premiumminds.billy.andorra.services.documents.util.ADIssuingParams;
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADReceiptIssuingHandler.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADReceiptIssuingHandler.java
index a23c2c575..f6f7586cc 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADReceiptIssuingHandler.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADReceiptIssuingHandler.java
@@ -22,7 +22,7 @@
 import com.premiumminds.billy.andorra.persistence.entities.ADReceiptEntity;
 import com.premiumminds.billy.andorra.services.documents.util.ADIssuingParams;
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADSimpleInvoiceIssuingHandler.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADSimpleInvoiceIssuingHandler.java
index 971d48f5e..dcfa7487c 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADSimpleInvoiceIssuingHandler.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/documents/ADSimpleInvoiceIssuingHandler.java
@@ -22,7 +22,7 @@
 import com.premiumminds.billy.andorra.persistence.entities.ADSimpleInvoiceEntity;
 import com.premiumminds.billy.andorra.services.documents.util.ADIssuingParams;
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADAddress.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADAddress.java
index 4a9859b58..7abb21249 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADAddress.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADAddress.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.andorra.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Address;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADAddress;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADApplication.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADApplication.java
index bcdcce3f4..64eee3081 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADApplication.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADApplication.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.entities;
 
 import com.premiumminds.billy.andorra.services.builders.impl.ADApplicationBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Application;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADApplication;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADBusiness.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADBusiness.java
index a91016685..77b402b60 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADBusiness.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADBusiness.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.andorra.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Business;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADBusiness;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADContact.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADContact.java
index 84d41bfce..4db73e41e 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADContact.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADContact.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.entities;
 
 import com.premiumminds.billy.andorra.services.builders.impl.ADContactBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Contact;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADContact;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditNote.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditNote.java
index c7378db84..4b36f240e 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditNote.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditNote.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.entities;
 
 import com.premiumminds.billy.andorra.services.builders.impl.ADManualCreditNoteBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADBusiness;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADCreditNote;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditNoteEntry.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditNoteEntry.java
index 45b3a93c2..e251cea5a 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditNoteEntry.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditNoteEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.andorra.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADCreditNoteEntry;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADInvoice;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditReceipt.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditReceipt.java
index e83a9845d..e9f16442d 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditReceipt.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditReceipt.java
@@ -20,7 +20,7 @@
 
 import com.premiumminds.billy.andorra.services.builders.impl.ADCreditReceiptBuilderImpl;
 import com.premiumminds.billy.andorra.services.builders.impl.ADManualCreditReceiptBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADBusiness;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADCreditReceipt;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditReceiptEntry.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditReceiptEntry.java
index 6030632eb..b849db218 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditReceiptEntry.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCreditReceiptEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.andorra.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADCreditReceiptEntry;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADProduct;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCustomer.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCustomer.java
index 1b560dc1d..8ff750b68 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCustomer.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADCustomer.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.entities;
 
 import com.premiumminds.billy.andorra.services.builders.impl.ADCustomerBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Customer;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADContact;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADGenericInvoice.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADGenericInvoice.java
index aed896ba5..155050426 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADGenericInvoice.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADGenericInvoice.java
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADGenericInvoiceEntry.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADGenericInvoiceEntry.java
index da3926d45..74a3e0e2d 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADGenericInvoiceEntry.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADGenericInvoiceEntry.java
@@ -20,7 +20,7 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADGenericInvoiceEntity;
 import com.premiumminds.billy.andorra.services.builders.impl.ADGenericInvoiceEntryBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADGenericInvoice;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADInvoice.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADInvoice.java
index a80ade4e1..2a1acaa42 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADInvoice.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADInvoice.java
@@ -22,7 +22,7 @@
 import com.premiumminds.billy.andorra.services.builders.impl.ADManualInvoiceBuilderImpl;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADInvoiceEntry.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADInvoiceEntry.java
index ed5e32570..a45c3cbfa 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADInvoiceEntry.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADInvoiceEntry.java
@@ -25,7 +25,7 @@
 import com.premiumminds.billy.andorra.persistence.dao.DAOADRegionContext;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADTax;
 import com.premiumminds.billy.andorra.services.builders.impl.ADManualInvoiceEntryBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public interface ADInvoiceEntry extends ADGenericInvoiceEntry {
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADPayment.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADPayment.java
index 5201296ba..a732edcda 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADPayment.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADPayment.java
@@ -21,7 +21,7 @@
 import com.premiumminds.billy.andorra.services.builders.impl.ADPaymentBuilderImpl;
 import java.math.BigDecimal;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.util.PaymentMechanism;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADProduct.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADProduct.java
index 223b0835e..7a42fc044 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADProduct.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADProduct.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.entities;
 
 import com.premiumminds.billy.andorra.services.builders.impl.ADProductBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Product;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADProduct;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADReceipt.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADReceipt.java
index 784df7ed5..0e15905c6 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADReceipt.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADReceipt.java
@@ -21,7 +21,7 @@
 import com.premiumminds.billy.andorra.services.builders.impl.ADReceiptBuilderImpl;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADReceiptEntry.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADReceiptEntry.java
index 30f999d86..8fff1d3dc 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADReceiptEntry.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADReceiptEntry.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.entities;
 
 import com.premiumminds.billy.andorra.services.builders.impl.ADReceiptEntryBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADProduct;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADReceipt;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADRegionContext.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADRegionContext.java
index 50833c40e..110b6ca42 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADRegionContext.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADRegionContext.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.entities;
 
 import com.premiumminds.billy.andorra.services.builders.impl.ADRegionContextBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Context;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADRegionContext;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADShippingPoint.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADShippingPoint.java
index a059906ad..8187015a8 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADShippingPoint.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADShippingPoint.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.andorra.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.ShippingPoint;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADShippingPoint;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADSimpleInvoice.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADSimpleInvoice.java
index 138d27655..67501fbd3 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADSimpleInvoice.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADSimpleInvoice.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.andorra.services.entities;
 
 import com.premiumminds.billy.andorra.services.builders.impl.ADSimpleInvoiceBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADBusiness;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADCustomer;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADSupplier.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADSupplier.java
index 2dd67b953..dece3e53c 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADSupplier.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADSupplier.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.andorra.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Supplier;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADSupplier;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADTax.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADTax.java
index 56d387284..aa0874ab7 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADTax.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/entities/ADTax.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.andorra.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Tax;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADRegionContext;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADCreditNoteDataExtractor.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADCreditNoteDataExtractor.java
index 25d213e5c..971dfe3e3 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADCreditNoteDataExtractor.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADCreditNoteDataExtractor.java
@@ -27,7 +27,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.gin.services.exceptions.ExportServiceException;
 import com.premiumminds.billy.gin.services.export.BillyDataExtractor;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADCreditReceiptDataExtractor.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADCreditReceiptDataExtractor.java
index f3d50ca01..bb694333c 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADCreditReceiptDataExtractor.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADCreditReceiptDataExtractor.java
@@ -27,7 +27,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.gin.services.exceptions.ExportServiceException;
 import com.premiumminds.billy.gin.services.export.BillyDataExtractor;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADInvoiceDataExtractor.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADInvoiceDataExtractor.java
index fc0a1f132..7f66fda19 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADInvoiceDataExtractor.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADInvoiceDataExtractor.java
@@ -24,7 +24,7 @@
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.gin.services.exceptions.ExportServiceException;
 import com.premiumminds.billy.gin.services.export.BillyDataExtractor;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADReceiptDataExtractor.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADReceiptDataExtractor.java
index 150edcf28..e206dacd1 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADReceiptDataExtractor.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADReceiptDataExtractor.java
@@ -22,7 +22,7 @@
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.gin.services.exceptions.ExportServiceException;
 import com.premiumminds.billy.gin.services.export.BillyDataExtractor;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADSimpleInvoiceDataExtractor.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADSimpleInvoiceDataExtractor.java
index 38286f074..d3bd422ca 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADSimpleInvoiceDataExtractor.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/export/ADSimpleInvoiceDataExtractor.java
@@ -24,7 +24,7 @@
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.gin.services.exceptions.ExportServiceException;
 import com.premiumminds.billy.gin.services.export.BillyDataExtractor;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADApplicationPersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADApplicationPersistenceService.java
index 15b7885a4..cc81b116f 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADApplicationPersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADApplicationPersistenceService.java
@@ -27,7 +27,7 @@
 import com.premiumminds.billy.core.services.entities.Application;
 import com.premiumminds.billy.persistence.services.PersistenceService;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADApplication;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class ADApplicationPersistenceService implements PersistenceService<Application, ADApplication> {
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADBusinessPersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADBusinessPersistenceService.java
index d84af15bb..1cf28abdb 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADBusinessPersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADBusinessPersistenceService.java
@@ -27,7 +27,7 @@
 import com.premiumminds.billy.core.services.entities.Business;
 import com.premiumminds.billy.persistence.services.PersistenceService;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADBusiness;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class ADBusinessPersistenceService implements PersistenceService<Business, ADBusiness> {
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCreditNotePersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCreditNotePersistenceService.java
index 4b71b67ec..fd2e222a4 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCreditNotePersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCreditNotePersistenceService.java
@@ -19,8 +19,8 @@
 package com.premiumminds.billy.andorra.services.persistence;
 
 import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADCreditNote;
 import com.premiumminds.billy.andorra.persistence.entities.ADCreditNoteEntity;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCreditReceiptPersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCreditReceiptPersistenceService.java
index 6bc5ca832..655b88871 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCreditReceiptPersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCreditReceiptPersistenceService.java
@@ -19,8 +19,8 @@
 package com.premiumminds.billy.andorra.services.persistence;
 
 import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADCreditReceipt;
 import com.premiumminds.billy.andorra.persistence.entities.ADCreditReceiptEntity;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCustomerPersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCustomerPersistenceService.java
index 3c21c695b..41b331d04 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCustomerPersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADCustomerPersistenceService.java
@@ -27,7 +27,7 @@
 import com.premiumminds.billy.core.services.entities.Customer;
 import com.premiumminds.billy.persistence.services.PersistenceService;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADCustomer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class ADCustomerPersistenceService implements PersistenceService<Customer, ADCustomer> {
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADInvoicePersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADInvoicePersistenceService.java
index bf07a6d3d..c3c4acc23 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADInvoicePersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADInvoicePersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.andorra.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADInvoice;
 import com.premiumminds.billy.andorra.persistence.entities.ADInvoiceEntity;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADProductPersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADProductPersistenceService.java
index 846a82826..03fef8580 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADProductPersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADProductPersistenceService.java
@@ -20,7 +20,7 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADProductEntity;
 import com.premiumminds.billy.andorra.services.entities.ADProduct;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADReceiptPersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADReceiptPersistenceService.java
index 69dfd909d..d246adaff 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADReceiptPersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADReceiptPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.andorra.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADReceipt;
 import com.premiumminds.billy.andorra.persistence.entities.ADReceiptEntity;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADRegionContextPersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADRegionContextPersistenceService.java
index 85fe5a08a..0e0fa6997 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADRegionContextPersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADRegionContextPersistenceService.java
@@ -20,7 +20,7 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADRegionContextEntity;
 import com.premiumminds.billy.andorra.services.entities.ADRegionContext;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADSimpleInvoicePersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADSimpleInvoicePersistenceService.java
index 6c6425da1..449652842 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADSimpleInvoicePersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADSimpleInvoicePersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.andorra.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.andorra.persistence.dao.DAOADSimpleInvoice;
 import com.premiumminds.billy.andorra.persistence.entities.ADSimpleInvoiceEntity;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADSupplierPersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADSupplierPersistenceService.java
index c2a258dd7..9ea394d98 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADSupplierPersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADSupplierPersistenceService.java
@@ -27,7 +27,7 @@
 import com.premiumminds.billy.core.services.entities.Supplier;
 import com.premiumminds.billy.persistence.services.PersistenceService;
 import com.premiumminds.billy.andorra.persistence.dao.DAOADSupplier;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class ADSupplierPersistenceService implements PersistenceService<Supplier, ADSupplier> {
 
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADTaxPersistenceService.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADTaxPersistenceService.java
index 48a69dd28..c9d9ee95e 100644
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADTaxPersistenceService.java
+++ b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/services/persistence/ADTaxPersistenceService.java
@@ -20,7 +20,7 @@
 
 import com.premiumminds.billy.andorra.persistence.entities.ADTaxEntity;
 import com.premiumminds.billy.andorra.services.entities.ADTax;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/util/SchemaExport.java b/billy-andorra/src/main/java/com/premiumminds/billy/andorra/util/SchemaExport.java
deleted file mode 100644
index 14a10700f..000000000
--- a/billy-andorra/src/main/java/com/premiumminds/billy/andorra/util/SchemaExport.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2017 Premium Minds.
- *
- * This file is part of billy andorra (AD Pack).
- *
- * billy andorra (AD Pack) is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * billy andorra (AD Pack) is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with billy andorra (AD Pack). If not, see <http://www.gnu.org/licenses/>.
- */
-package com.premiumminds.billy.andorra.util;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
-import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
-import org.hibernate.jpa.boot.internal.PersistenceXmlParser;
-import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
-import org.hibernate.jpa.boot.spi.ProviderChecker;
-import org.hibernate.tool.schema.TargetType;
-
-public class SchemaExport {
-
-    public static void main(String[] args) {
-        SchemaExport
-            .exportSchema(args[0], args[1], args[2], args[3], args[4], args[5]);
-    }
-
-    private static void exportSchema(String persistenceUnit, String url, String username, String password,
-        String outputDir, String delimiter) {
-
-        File file = new File(outputDir);
-        new File(file.getParent()).mkdirs();
-
-        Map<String, Object> properties = setupProperties(url, username, password);
-        EntityManagerFactoryBuilderImpl entityManagerFactoryBuilder =
-            getEntityManagerFactoryBuilderOrNull(persistenceUnit, properties);
-
-        EntityManagerFactory factory = entityManagerFactoryBuilder.build();
-        MetadataImplementor metaData = entityManagerFactoryBuilder.getMetadata();
-
-        org.hibernate.tool.hbm2ddl.SchemaExport se = new org.hibernate.tool.hbm2ddl.SchemaExport();
-        se.setOutputFile(outputDir);
-        se.setFormat(true);
-        se.setDelimiter(delimiter);
-        se.execute(EnumSet.of(TargetType.SCRIPT), org.hibernate.tool.hbm2ddl.SchemaExport.Action.CREATE, metaData);
-
-        factory.close();
-    }
-
-    private static Map<String, Object> setupProperties(String url, String username, String password) {
-        Map<String, Object>  properties = new HashMap<>();
-        properties.put("javax.persistence.jdbc.url", url);
-        properties.put("javax.persistence.jdbc.user", username);
-        properties.put("javax.persistence.jdbc.password", password);
-
-        return Collections.unmodifiableMap(properties);
-    }
-
-    private static EntityManagerFactoryBuilderImpl getEntityManagerFactoryBuilderOrNull(String persistenceUnitName,
-        Map<String, Object> properties) {
-
-        final List<ParsedPersistenceXmlDescriptor> units;
-        try {
-            units = PersistenceXmlParser.locatePersistenceUnits(properties);
-        } catch (Exception e) {
-            throw new PersistenceException("Unable to locate persistence units", e);
-        }
-
-        if (persistenceUnitName == null && units.size() > 1) {
-            throw new PersistenceException("No name provided and multiple persistence units found");
-        }
-
-        for (ParsedPersistenceXmlDescriptor persistenceUnit : units) {
-            final boolean matches = persistenceUnitName == null || persistenceUnit.getName().equals(persistenceUnitName);
-            if (!matches) {
-                continue;
-            }
-
-            if (!ProviderChecker.isProvider(persistenceUnit, properties)) {
-                continue;
-            }
-
-            return getEntityManagerFactoryBuilder(persistenceUnit, properties, null);
-        }
-
-        return null;
-    }
-
-    private static EntityManagerFactoryBuilderImpl getEntityManagerFactoryBuilder(
-        PersistenceUnitDescriptor persistenceUnitDescriptor, Map<String, Object> integration,
-        ClassLoader providedClassLoader) {
-
-        return new EntityManagerFactoryBuilderImpl(persistenceUnitDescriptor, integration, providedClassLoader);
-    }
-}
diff --git a/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/AndorraTestPersistenceDependencyModule.java b/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/AndorraTestPersistenceDependencyModule.java
index 3e5b72ff3..426ae4dd0 100644
--- a/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/AndorraTestPersistenceDependencyModule.java
+++ b/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/AndorraTestPersistenceDependencyModule.java
@@ -22,12 +22,14 @@
 import com.google.inject.Inject;
 import com.google.inject.persist.PersistService;
 import com.google.inject.persist.jpa.JpaPersistModule;
+import com.google.inject.persist.jpa.JpaPersistOptions;
 
 public class AndorraTestPersistenceDependencyModule extends AbstractModule {
 
     @Override
     protected void configure() {
-        JpaPersistModule persistModule = new JpaPersistModule("BillyAndorraTestPersistenceUnit");
+        final var options = JpaPersistOptions.builder().setAutoBeginWorkOnEntityManagerCreation(true).build();
+        JpaPersistModule persistModule = new JpaPersistModule("BillyAndorraTestPersistenceUnit", options);
         this.install(persistModule);
     }
 
diff --git a/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/services/dao/TestDAOADInvoice.java b/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/services/dao/TestDAOADInvoice.java
index debd5e112..e7b48e1b3 100644
--- a/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/services/dao/TestDAOADInvoice.java
+++ b/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/services/dao/TestDAOADInvoice.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.UUID;
 
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/util/ADBusinessTestUtil.java b/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/util/ADBusinessTestUtil.java
index a93c0a24d..73e271b9a 100644
--- a/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/util/ADBusinessTestUtil.java
+++ b/billy-andorra/src/test/java/com/premiumminds/billy/andorra/test/util/ADBusinessTestUtil.java
@@ -30,7 +30,7 @@
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
 
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import java.net.MalformedURLException;
 import java.time.ZoneId;
 import java.util.UUID;
diff --git a/billy-andorra/src/test/resources/META-INF/persistence.xml b/billy-andorra/src/test/resources/META-INF/persistence.xml
index 2ff01c753..2d6392a91 100644
--- a/billy-andorra/src/test/resources/META-INF/persistence.xml
+++ b/billy-andorra/src/test/resources/META-INF/persistence.xml
@@ -41,14 +41,13 @@
 		<mapping-file>META-INF/orm-core.xml</mapping-file>
 		<mapping-file>META-INF/orm-andorra.xml</mapping-file>
 		<properties>
-			<property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-			<property name="javax.persistence.jdbc.url" value="jdbc:h2:/tmp/h2db" />
-			<property name="javax.persistence.jdbc.user" value="billytest" />
-			<property name="javax.persistence.jdbc.password" value="billytest" />
+			<property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver" />
+			<property name="jakarta.persistence.jdbc.url" value="jdbc:h2:/tmp/h2db" />
+			<property name="jakarta.persistence.jdbc.user" value="billytest" />
+			<property name="jakarta.persistence.jdbc.password" value="billytest" />
 
 			<property name="hibernate.show_sql" value="false" />
 			<property name="hibernate.hbm2ddl.auto" value="create" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
 			<property name="hibernate.globally_quoted_identifiers" value="true"/>
 		</properties>
 	</persistence-unit>
diff --git a/billy-core-jpa/pom.xml b/billy-core-jpa/pom.xml
index c29266ed5..f68ffc5b3 100644
--- a/billy-core-jpa/pom.xml
+++ b/billy-core-jpa/pom.xml
@@ -37,12 +37,12 @@
 
 		<!-- PERSISTENCE -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-envers</artifactId>
 		</dependency>
 
@@ -77,6 +77,7 @@
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-jpa</artifactId>
 			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
 			<scope>provided</scope>
 		</dependency>
 
@@ -113,6 +114,7 @@
 						<groupId>com.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
 						<version>${querydsl.version}</version>
+						<classifier>jakarta</classifier>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/converters/ZoneIdAttributeConverter.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/converters/ZoneIdAttributeConverter.java
index 755cd4c26..a83430ae8 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/converters/ZoneIdAttributeConverter.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/converters/ZoneIdAttributeConverter.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.persistence.converters;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 import java.time.ZoneId;
 
 @Converter(autoApply = true)
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAO.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAO.java
index 673543562..e8595e4ed 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAO.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAO.java
@@ -21,12 +21,12 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceException;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAOGenericInvoiceEntryImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAOGenericInvoiceEntryImpl.java
index 4b6c3ca3d..d20fc823a 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAOGenericInvoiceEntryImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAOGenericInvoiceEntryImpl.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.AbstractDAOGenericInvoiceEntry;
 import com.premiumminds.billy.core.persistence.entities.GenericInvoiceEntryEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAOGenericInvoiceImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAOGenericInvoiceImpl.java
index eb03c3431..ac032a946 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAOGenericInvoiceImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/AbstractDAOGenericInvoiceImpl.java
@@ -21,9 +21,9 @@
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQuery;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.AbstractDAOGenericInvoice;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOAddressImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOAddressImpl.java
index ac72d2bb3..d1d17b158 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOAddressImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOAddressImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOAddress;
 import com.premiumminds.billy.core.persistence.entities.AddressEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOApplicationImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOApplicationImpl.java
index 01dc76988..6b3d5abe8 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOApplicationImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOApplicationImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOApplication;
 import com.premiumminds.billy.core.persistence.entities.ApplicationEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOBankAccountImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOBankAccountImpl.java
index 2f1bfcfb7..e51ea9940 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOBankAccountImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOBankAccountImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOBankAccount;
 import com.premiumminds.billy.core.persistence.entities.BankAccountEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOBusinessImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOBusinessImpl.java
index 3fb721b7d..336760d21 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOBusinessImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOBusinessImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOBusiness;
 import com.premiumminds.billy.core.persistence.entities.BusinessEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOContactImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOContactImpl.java
index e983842c4..00513ec36 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOContactImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOContactImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOContact;
 import com.premiumminds.billy.core.persistence.entities.ContactEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOContextImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOContextImpl.java
index f537f5cd0..959cb538b 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOContextImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOContextImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOContext;
 import com.premiumminds.billy.core.persistence.entities.ContextEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOCustomerImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOCustomerImpl.java
index 50df83c8a..22b088733 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOCustomerImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOCustomerImpl.java
@@ -19,9 +19,9 @@
 package com.premiumminds.billy.persistence.dao.jpa;
 
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOCustomer;
 import com.premiumminds.billy.core.persistence.entities.CustomerEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOGenericInvoiceEntryImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOGenericInvoiceEntryImpl.java
index 6c348c15e..fd146b731 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOGenericInvoiceEntryImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOGenericInvoiceEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOGenericInvoiceEntry;
 import com.premiumminds.billy.core.persistence.entities.GenericInvoiceEntryEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOGenericInvoiceImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOGenericInvoiceImpl.java
index 9fc013090..dfe977914 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOGenericInvoiceImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOGenericInvoiceImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOGenericInvoice;
 import com.premiumminds.billy.core.persistence.entities.GenericInvoiceEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOInvoiceSeriesImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOInvoiceSeriesImpl.java
index 4a8721844..2af798a7b 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOInvoiceSeriesImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOInvoiceSeriesImpl.java
@@ -25,10 +25,10 @@
 import com.premiumminds.billy.persistence.entities.jpa.QJPAInvoiceSeriesEntity;
 import com.premiumminds.billy.core.services.entities.InvoiceSeries;
 import com.querydsl.jpa.impl.JPAQuery;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
 
 public class DAOInvoiceSeriesImpl extends AbstractDAO<InvoiceSeries, InvoiceSeriesEntity, JPAInvoiceSeriesEntity>
         implements DAOInvoiceSeries {
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOPaymentImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOPaymentImpl.java
index 1ae8a834d..d815b57e4 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOPaymentImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOPaymentImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOPayment;
 import com.premiumminds.billy.core.persistence.entities.PaymentEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOProductImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOProductImpl.java
index 77e7a5e41..c1b074339 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOProductImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOProductImpl.java
@@ -19,9 +19,9 @@
 package com.premiumminds.billy.persistence.dao.jpa;
 
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOProduct;
 import com.premiumminds.billy.core.persistence.entities.ProductEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOShippingPointImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOShippingPointImpl.java
index 20cb5d2b7..587eaa495 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOShippingPointImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOShippingPointImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOShippingPoint;
 import com.premiumminds.billy.core.persistence.entities.ShippingPointEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOSupplierImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOSupplierImpl.java
index ff28792d5..b3a875954 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOSupplierImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOSupplierImpl.java
@@ -19,9 +19,9 @@
 package com.premiumminds.billy.persistence.dao.jpa;
 
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOSupplier;
 import com.premiumminds.billy.core.persistence.entities.SupplierEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOTaxImpl.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOTaxImpl.java
index 9fd15533f..3f58d5c60 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOTaxImpl.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/dao/jpa/DAOTaxImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.persistence.dao.DAOTax;
 import com.premiumminds.billy.core.persistence.entities.TaxEntity;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAAddressEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAAddressEntity.java
index 92c724b13..e89fbee41 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAAddressEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAAddressEntity.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.entities.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAApplicationEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAApplicationEntity.java
index 50da0fc98..48083299e 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAApplicationEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAApplicationEntity.java
@@ -20,15 +20,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABankAccountEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABankAccountEntity.java
index f863992e8..c72874688 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABankAccountEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABankAccountEntity.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.entities.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABaseEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABaseEntity.java
index 3d6a670c4..cafd5f221 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABaseEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABaseEntity.java
@@ -20,18 +20,18 @@
 
 import java.util.Date;
 import java.util.UUID;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.PreUpdate;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 import org.apache.commons.lang3.Validate;
 import org.hibernate.envers.Audited;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABusinessEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABusinessEntity.java
index a34d868cb..302899a57 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABusinessEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPABusinessEntity.java
@@ -31,17 +31,17 @@
 import com.premiumminds.billy.persistence.converters.ZoneIdAttributeConverter;
 import org.hibernate.envers.Audited;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAContactEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAContactEntity.java
index 127786d38..e90a7f204 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAContactEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAContactEntity.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.persistence.entities.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAContextEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAContextEntity.java
index 9d0c7a81c..1dbd3bbaf 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAContextEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAContextEntity.java
@@ -18,11 +18,11 @@
  */
 package com.premiumminds.billy.persistence.entities.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPACustomerEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPACustomerEntity.java
index ea9acb1be..9e58db11c 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPACustomerEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPACustomerEntity.java
@@ -20,14 +20,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAGenericInvoiceEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAGenericInvoiceEntity.java
index 771ed778e..82b2b7c18 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAGenericInvoiceEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAGenericInvoiceEntity.java
@@ -36,22 +36,22 @@
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.UniqueConstraint;
 import org.hibernate.envers.Audited;
 
 @Entity
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAGenericInvoiceEntryEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAGenericInvoiceEntryEntity.java
index 15e38b3ae..b3a10c2da 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAGenericInvoiceEntryEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAGenericInvoiceEntryEntity.java
@@ -24,19 +24,19 @@
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAInvoiceSeriesEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAInvoiceSeriesEntity.java
index efc4e72f0..f19165527 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAInvoiceSeriesEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAInvoiceSeriesEntity.java
@@ -19,12 +19,12 @@
 package com.premiumminds.billy.persistence.entities.jpa;
 
 import java.util.Optional;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAPaymentEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAPaymentEntity.java
index 4cadb84c7..3f75dbf9f 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAPaymentEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAPaymentEntity.java
@@ -19,11 +19,11 @@
 package com.premiumminds.billy.persistence.entities.jpa;
 
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAProductEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAProductEntity.java
index dd1f4865c..129b97031 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAProductEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAProductEntity.java
@@ -20,14 +20,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAShippingPointEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAShippingPointEntity.java
index 35d5e400c..77a80f7e5 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAShippingPointEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPAShippingPointEntity.java
@@ -19,14 +19,14 @@
 package com.premiumminds.billy.persistence.entities.jpa;
 
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPASupplierEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPASupplierEntity.java
index d769bf2c5..cc27864f8 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPASupplierEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPASupplierEntity.java
@@ -20,14 +20,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPATaxEntity.java b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPATaxEntity.java
index 2f3cd4b0f..445c7ccb4 100644
--- a/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPATaxEntity.java
+++ b/billy-core-jpa/src/main/java/com/premiumminds/billy/persistence/entities/jpa/JPATaxEntity.java
@@ -21,15 +21,15 @@
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-core-jpa/src/test/java/com/premiumminds/billy/core/jpa/CoreJPATestPersistenceDependencyModule.java b/billy-core-jpa/src/test/java/com/premiumminds/billy/core/jpa/CoreJPATestPersistenceDependencyModule.java
index 9bef2b6a0..2bbfb301c 100644
--- a/billy-core-jpa/src/test/java/com/premiumminds/billy/core/jpa/CoreJPATestPersistenceDependencyModule.java
+++ b/billy-core-jpa/src/test/java/com/premiumminds/billy/core/jpa/CoreJPATestPersistenceDependencyModule.java
@@ -22,12 +22,14 @@
 import com.google.inject.Inject;
 import com.google.inject.persist.PersistService;
 import com.google.inject.persist.jpa.JpaPersistModule;
+import com.google.inject.persist.jpa.JpaPersistOptions;
 
 public class CoreJPATestPersistenceDependencyModule extends AbstractModule {
 
     @Override
     protected void configure() {
-        this.install(new JpaPersistModule("BillyCoreJPATestPersistenceUnit"));
+        final var options = JpaPersistOptions.builder().setAutoBeginWorkOnEntityManagerCreation(true).build();
+        this.install(new JpaPersistModule("BillyCoreJPATestPersistenceUnit", options));
     }
 
     public static class Initializer {
diff --git a/billy-core-jpa/src/test/java/com/premiumminds/billy/core/jpa/GenericTest.java b/billy-core-jpa/src/test/java/com/premiumminds/billy/core/jpa/GenericTest.java
index c29fcdd21..069e2a550 100644
--- a/billy-core-jpa/src/test/java/com/premiumminds/billy/core/jpa/GenericTest.java
+++ b/billy-core-jpa/src/test/java/com/premiumminds/billy/core/jpa/GenericTest.java
@@ -118,6 +118,8 @@ void test1() {
         final TaxEntity taxEntity = daoTax.create((TaxEntity) taxBuilder.build());
 
         Assertions.assertNotNull(taxEntity);
+
+        daoContext.commit();
     }
 
 }
diff --git a/billy-core-jpa/src/test/resources/META-INF/persistence.xml b/billy-core-jpa/src/test/resources/META-INF/persistence.xml
index aa70bbd79..2b22777a6 100644
--- a/billy-core-jpa/src/test/resources/META-INF/persistence.xml
+++ b/billy-core-jpa/src/test/resources/META-INF/persistence.xml
@@ -40,14 +40,13 @@
 
 		<mapping-file>META-INF/orm-core.xml</mapping-file>
 		<properties>
-			<property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-			<property name="javax.persistence.jdbc.url" value="jdbc:h2:/tmp/h2db" />
-			<property name="javax.persistence.jdbc.user" value="billytest" />
-			<property name="javax.persistence.jdbc.password" value="billytest" />
+			<property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver" />
+			<property name="jakarta.persistence.jdbc.url" value="jdbc:h2:/tmp/h2db" />
+			<property name="jakarta.persistence.jdbc.user" value="billytest" />
+			<property name="jakarta.persistence.jdbc.password" value="billytest" />
 
 			<property name="hibernate.show_sql" value="false" />
 			<property name="hibernate.hbm2ddl.auto" value="create" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
 			<property name="hibernate.globally_quoted_identifiers" value="true"/>
 		</properties>
 	</persistence-unit>
diff --git a/billy-core/pom.xml b/billy-core/pom.xml
index 4530d8874..5ab444ca6 100644
--- a/billy-core/pom.xml
+++ b/billy-core/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>jakarta.persistence</groupId>
 			<artifactId>jakarta.persistence-api</artifactId>
-			<version>2.2.3</version>
+			<version>3.1.0</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/Config.java b/billy-core/src/main/java/com/premiumminds/billy/core/Config.java
index 8e6fa64f5..a2e3f2238 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/Config.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/Config.java
@@ -21,7 +21,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/CoreDependencyModule.java b/billy-core/src/main/java/com/premiumminds/billy/core/CoreDependencyModule.java
index dcd63d1ee..ff3fdd94a 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/CoreDependencyModule.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/CoreDependencyModule.java
@@ -20,7 +20,7 @@
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.matcher.AbstractMatcher;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/persistence/dao/DAO.java b/billy-core/src/main/java/com/premiumminds/billy/core/persistence/dao/DAO.java
index 4a56486e8..07e4f417f 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/persistence/dao/DAO.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/persistence/dao/DAO.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.persistence.dao;
 
-import javax.persistence.LockModeType;
+import jakarta.persistence.LockModeType;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Entity;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/persistence/dao/DAOInvoiceSeries.java b/billy-core/src/main/java/com/premiumminds/billy/core/persistence/dao/DAOInvoiceSeries.java
index b26d5a196..862aa49e4 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/persistence/dao/DAOInvoiceSeries.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/persistence/dao/DAOInvoiceSeries.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.persistence.dao;
 
-import javax.persistence.LockModeType;
+import jakarta.persistence.LockModeType;
 
 import com.premiumminds.billy.core.persistence.entities.InvoiceSeriesEntity;
 import com.premiumminds.billy.core.services.entities.InvoiceSeries;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/AddressBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/AddressBuilderImpl.java
index 591aab38b..5bcc28d98 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/AddressBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/AddressBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.persistence.dao.DAOAddress;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ApplicationBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ApplicationBuilderImpl.java
index a997816af..0b77aa4ab 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ApplicationBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ApplicationBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.persistence.dao.DAOApplication;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/BankAccountBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/BankAccountBuilderImpl.java
index 3b988e96c..29b172995 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/BankAccountBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/BankAccountBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.persistence.dao.DAOBankAccount;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/BusinessBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/BusinessBuilderImpl.java
index ed99f21d6..7cb1e2c25 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/BusinessBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/BusinessBuilderImpl.java
@@ -38,7 +38,7 @@
 import com.premiumminds.billy.core.util.Localizer;
 import com.premiumminds.billy.core.util.NotOnUpdate;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.time.ZoneId;
 
 public class BusinessBuilderImpl<TBuilder extends BusinessBuilderImpl<TBuilder, TBusiness>, TBusiness extends Business>
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ContactBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ContactBuilderImpl.java
index 866cec2d0..7358e6ce0 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ContactBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ContactBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.persistence.dao.DAOContact;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ContextBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ContextBuilderImpl.java
index 1f4ec3d0a..d05e218d2 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ContextBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ContextBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/CustomerBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/CustomerBuilderImpl.java
index 1f68562a7..2b942070b 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/CustomerBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/CustomerBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.persistence.dao.DAOContact;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/GenericInvoiceEntryBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/GenericInvoiceEntryBuilderImpl.java
index c41344042..709b605fd 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/GenericInvoiceEntryBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/GenericInvoiceEntryBuilderImpl.java
@@ -23,7 +23,7 @@
 import java.util.Collection;
 import java.util.Currency;
 import java.util.Date;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.time.DateUtils;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/PaymentBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/PaymentBuilderImpl.java
index d652c98d5..4b37ddf36 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/PaymentBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/PaymentBuilderImpl.java
@@ -20,7 +20,7 @@
 
 import java.util.Date;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.persistence.dao.DAOPayment;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ProductBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ProductBuilderImpl.java
index 5a5786266..ead3308b6 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ProductBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ProductBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.persistence.dao.DAOProduct;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ShippingPointBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ShippingPointBuilderImpl.java
index 5b2f574ba..3b0910c85 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ShippingPointBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/ShippingPointBuilderImpl.java
@@ -20,7 +20,7 @@
 
 import java.util.Date;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.persistence.dao.DAOShippingPoint;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/SupplierBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/SupplierBuilderImpl.java
index bb49e0aad..5066b7a08 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/SupplierBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/SupplierBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.persistence.dao.DAOSupplier;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/TaxBuilderImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/TaxBuilderImpl.java
index e1934fa43..5deb1be8f 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/TaxBuilderImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/builders/impl/TaxBuilderImpl.java
@@ -21,7 +21,7 @@
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.commons.lang3.Validate;
 
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/documents/impl/DocumentIssuingServiceImpl.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/documents/impl/DocumentIssuingServiceImpl.java
index cb5a4a404..8255ef05f 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/documents/impl/DocumentIssuingServiceImpl.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/documents/impl/DocumentIssuingServiceImpl.java
@@ -22,7 +22,7 @@
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.SeriesUniqueCodeNotFilled;
 import com.premiumminds.billy.core.persistence.dao.DAOGenericInvoice;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Address.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Address.java
index 64bb5af4b..5c4539662 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Address.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Address.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOAddress;
 import com.premiumminds.billy.core.services.builders.impl.AddressBuilderImpl;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Application.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Application.java
index 0c9e721e3..8b016a909 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Application.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Application.java
@@ -20,7 +20,7 @@
 
 import java.util.Collection;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOApplication;
 import com.premiumminds.billy.core.services.builders.impl.ApplicationBuilderImpl;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Contact.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Contact.java
index 4b184724e..9f23f1fe7 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Contact.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Contact.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOContact;
 import com.premiumminds.billy.core.services.builders.impl.ContactBuilderImpl;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Context.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Context.java
index 9a2bb48ef..9afbed0eb 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Context.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Context.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.core.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOContext;
 import com.premiumminds.billy.core.services.builders.impl.ContextBuilderImpl;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Customer.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Customer.java
index 9596f5894..43737d00c 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Customer.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Customer.java
@@ -20,7 +20,7 @@
 
 import java.util.Collection;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOContact;
 import com.premiumminds.billy.core.persistence.dao.DAOCustomer;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Payment.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Payment.java
index 3ae5cc2b3..994eafe9f 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Payment.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Payment.java
@@ -20,7 +20,7 @@
 
 import java.util.Date;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOPayment;
 import com.premiumminds.billy.core.services.builders.impl.PaymentBuilderImpl;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Product.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Product.java
index ac069a200..5978451ca 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Product.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Product.java
@@ -20,7 +20,7 @@
 
 import java.util.Collection;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOProduct;
 import com.premiumminds.billy.core.persistence.dao.DAOTax;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/ShippingPoint.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/ShippingPoint.java
index 6a572a244..a9fbca252 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/ShippingPoint.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/ShippingPoint.java
@@ -20,7 +20,7 @@
 
 import java.util.Date;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOShippingPoint;
 import com.premiumminds.billy.core.services.builders.impl.ShippingPointBuilderImpl;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Supplier.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Supplier.java
index 261fd3bc7..a72203347 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Supplier.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Supplier.java
@@ -20,7 +20,7 @@
 
 import java.util.Collection;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOSupplier;
 import com.premiumminds.billy.core.services.builders.impl.SupplierBuilderImpl;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Tax.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Tax.java
index 6dc1bfcf2..f20795657 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Tax.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/Tax.java
@@ -22,7 +22,7 @@
 import java.util.Currency;
 import java.util.Date;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOContext;
 import com.premiumminds.billy.core.persistence.dao.DAOTax;
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/documents/GenericInvoice.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/documents/GenericInvoice.java
index 1889244d7..525c62999 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/documents/GenericInvoice.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/documents/GenericInvoice.java
@@ -36,7 +36,7 @@
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public interface GenericInvoice extends Entity<GenericInvoice> {
 
diff --git a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/documents/GenericInvoiceEntry.java b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/documents/GenericInvoiceEntry.java
index 6d780c4fe..533192e2f 100644
--- a/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/documents/GenericInvoiceEntry.java
+++ b/billy-core/src/main/java/com/premiumminds/billy/core/services/entities/documents/GenericInvoiceEntry.java
@@ -22,7 +22,7 @@
 import java.util.Collection;
 import java.util.Currency;
 import java.util.Date;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOContext;
 import com.premiumminds.billy.core.persistence.dao.DAOGenericInvoice;
diff --git a/billy-france/pom.xml b/billy-france/pom.xml
index d6afefca5..f1eed75a7 100644
--- a/billy-france/pom.xml
+++ b/billy-france/pom.xml
@@ -51,12 +51,12 @@
 
 		<!-- PERSISTENCE -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-envers</artifactId>
 		</dependency>
 
@@ -65,6 +65,7 @@
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-jpa</artifactId>
 			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
 			<scope>provided</scope>
 		</dependency>
 
@@ -170,6 +171,7 @@
 						<groupId>com.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
 						<version>${querydsl.version}</version>
+						<classifier>jakarta</classifier>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/BillyFrance.java b/billy-france/src/main/java/com/premiumminds/billy/france/BillyFrance.java
index 96b2448ea..fe99b90c7 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/BillyFrance.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/BillyFrance.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.france;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/FrancePersistenceDependencyModule.java b/billy-france/src/main/java/com/premiumminds/billy/france/FrancePersistenceDependencyModule.java
index 5831848b2..16bec4f1e 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/FrancePersistenceDependencyModule.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/FrancePersistenceDependencyModule.java
@@ -22,6 +22,7 @@
 import com.google.inject.Inject;
 import com.google.inject.persist.PersistService;
 import com.google.inject.persist.jpa.JpaPersistModule;
+import com.google.inject.persist.jpa.JpaPersistOptions;
 
 public class FrancePersistenceDependencyModule extends AbstractModule {
 
@@ -33,7 +34,8 @@ public FrancePersistenceDependencyModule(String persistenceUnitId) {
 
     @Override
     protected void configure() {
-        JpaPersistModule persistModule = new JpaPersistModule(this.persistenceUnitId);
+        final var options = JpaPersistOptions.builder().setAutoBeginWorkOnEntityManagerCreation(true).build();
+        JpaPersistModule persistModule = new JpaPersistModule(this.persistenceUnitId, options);
         this.install(persistModule);
     }
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/AbstractDAOFRGenericInvoiceEntryImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/AbstractDAOFRGenericInvoiceEntryImpl.java
index 39f65222c..f32528aa7 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/AbstractDAOFRGenericInvoiceEntryImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/AbstractDAOFRGenericInvoiceEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.AbstractDAOGenericInvoiceEntryImpl;
 import com.premiumminds.billy.france.persistence.dao.AbstractDAOFRGenericInvoiceEntry;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/AbstractDAOFRGenericInvoiceImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/AbstractDAOFRGenericInvoiceImpl.java
index e39205adf..4ec43382e 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/AbstractDAOFRGenericInvoiceImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/AbstractDAOFRGenericInvoiceImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRAddressImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRAddressImpl.java
index c4772c9d3..a9b709098 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRAddressImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRAddressImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOAddressImpl;
 import com.premiumminds.billy.france.persistence.dao.DAOFRAddress;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRApplicationImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRApplicationImpl.java
index ba5ea1c59..cfa0788eb 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRApplicationImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRApplicationImpl.java
@@ -18,10 +18,10 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Application;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRBusinessImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRBusinessImpl.java
index dfdd02c15..24ab6537d 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRBusinessImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRBusinessImpl.java
@@ -18,10 +18,10 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRContactImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRContactImpl.java
index 31982ac8c..7335abe78 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRContactImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRContactImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOContactImpl;
 import com.premiumminds.billy.france.persistence.dao.DAOFRContact;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditNoteEntryImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditNoteEntryImpl.java
index 31a77df1c..c69c10606 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditNoteEntryImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditNoteEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRCreditNoteEntry;
 import com.premiumminds.billy.france.persistence.entities.FRCreditNoteEntity;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditNoteImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditNoteImpl.java
index 4a3de5e83..d4d178658 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditNoteImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditNoteImpl.java
@@ -20,9 +20,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditReceiptEntryImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditReceiptEntryImpl.java
index 24d734b16..995bad8c0 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditReceiptEntryImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditReceiptEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRCreditReceiptEntry;
 import com.premiumminds.billy.france.persistence.entities.FRCreditReceiptEntity;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditReceiptImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditReceiptImpl.java
index be3d12848..2ad36ef37 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditReceiptImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCreditReceiptImpl.java
@@ -20,9 +20,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCustomerImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCustomerImpl.java
index 7fdf7d56f..30614e7c7 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCustomerImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRCustomerImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOCustomerImpl;
 import com.premiumminds.billy.france.persistence.dao.DAOFRCustomer;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRGenericInvoiceEntryImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRGenericInvoiceEntryImpl.java
index e151dc90c..7cf3c2a47 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRGenericInvoiceEntryImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRGenericInvoiceEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRGenericInvoiceEntry;
 import com.premiumminds.billy.france.persistence.entities.FRGenericInvoiceEntryEntity;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRGenericInvoiceImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRGenericInvoiceImpl.java
index e5a64a49e..28275614f 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRGenericInvoiceImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRGenericInvoiceImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRGenericInvoice;
 import com.premiumminds.billy.france.persistence.entities.FRGenericInvoiceEntity;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRInvoiceEntryImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRInvoiceEntryImpl.java
index 61c49141f..a72db4639 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRInvoiceEntryImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRInvoiceEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRInvoiceEntry;
 import com.premiumminds.billy.france.persistence.entities.FRInvoiceEntryEntity;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRInvoiceImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRInvoiceImpl.java
index 0abd73fe2..d4184f3d4 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRInvoiceImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRInvoiceImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRInvoice;
 import com.premiumminds.billy.france.persistence.entities.FRInvoiceEntity;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRPaymentImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRPaymentImpl.java
index 8d245f916..30eadd2e6 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRPaymentImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRPaymentImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOPaymentImpl;
 import com.premiumminds.billy.france.persistence.dao.DAOFRPayment;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRProductImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRProductImpl.java
index 21ad3e0b6..7e65f76d0 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRProductImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRProductImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOProductImpl;
 import com.premiumminds.billy.france.persistence.dao.DAOFRProduct;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRReceiptEntryImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRReceiptEntryImpl.java
index 4a703395c..059265efb 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRReceiptEntryImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRReceiptEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRReceiptEntry;
 import com.premiumminds.billy.france.persistence.entities.FRReceiptEntryEntity;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRReceiptImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRReceiptImpl.java
index 1c38c50f4..15919efe9 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRReceiptImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRReceiptImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRReceipt;
 import com.premiumminds.billy.france.persistence.entities.FRReceiptEntity;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRRegionContextImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRRegionContextImpl.java
index 63db30a67..273513d8a 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRRegionContextImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRRegionContextImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOContextImpl;
 import com.premiumminds.billy.france.persistence.dao.DAOFRRegionContext;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRShippingPointImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRShippingPointImpl.java
index 4593b24f5..03b7db564 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRShippingPointImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRShippingPointImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOShippingPointImpl;
 import com.premiumminds.billy.france.persistence.dao.DAOFRShippingPoint;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRSimpleInvoiceImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRSimpleInvoiceImpl.java
index 590a08e00..fe58648a9 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRSimpleInvoiceImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRSimpleInvoiceImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRSimpleInvoice;
 import com.premiumminds.billy.france.persistence.entities.FRSimpleInvoiceEntity;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRSupplierImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRSupplierImpl.java
index 5c1746e78..44222a280 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRSupplierImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRSupplierImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOSupplierImpl;
 import com.premiumminds.billy.france.persistence.dao.DAOFRSupplier;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRTaxImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRTaxImpl.java
index a989d3a14..ceeda5ce5 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRTaxImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/dao/jpa/DAOFRTaxImpl.java
@@ -24,9 +24,9 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOTaxImpl;
 import com.premiumminds.billy.france.persistence.dao.DAOFRTax;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRAddressEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRAddressEntity.java
index 99aeb3adf..669e2ef50 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRAddressEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRAddressEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRApplicationEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRApplicationEntity.java
index 879894ab6..d6f25dcf5 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRApplicationEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRApplicationEntity.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRBusinessEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRBusinessEntity.java
index 65fd75641..cb9cbe2da 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRBusinessEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRBusinessEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRContactEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRContactEntity.java
index cf61273e0..752fec3b2 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRContactEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRContactEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditNoteEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditNoteEntity.java
index dc11b899a..93689ed7d 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditNoteEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditNoteEntity.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditNoteEntryEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditNoteEntryEntity.java
index 67e0d06b8..ecfebaaf5 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditNoteEntryEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditNoteEntryEntity.java
@@ -18,13 +18,13 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditReceiptEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditReceiptEntity.java
index 9e4af8cf3..64ed52999 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditReceiptEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditReceiptEntity.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditReceiptEntryEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditReceiptEntryEntity.java
index 21903ba42..d2ae51fd7 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditReceiptEntryEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCreditReceiptEntryEntity.java
@@ -18,13 +18,13 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCustomerEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCustomerEntity.java
index 9767a4368..2bc53d449 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCustomerEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRCustomerEntity.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRGenericInvoiceEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRGenericInvoiceEntity.java
index 75f36e639..78f23153f 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRGenericInvoiceEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRGenericInvoiceEntity.java
@@ -20,9 +20,9 @@
 
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRGenericInvoiceEntryEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRGenericInvoiceEntryEntity.java
index 95700288c..affa0457a 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRGenericInvoiceEntryEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRGenericInvoiceEntryEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRInvoiceEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRInvoiceEntity.java
index f90ff4d2c..bf337b66b 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRInvoiceEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRInvoiceEntity.java
@@ -20,10 +20,10 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRInvoiceEntryEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRInvoiceEntryEntity.java
index 2d51699c5..b6f3825e1 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRInvoiceEntryEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRInvoiceEntryEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRPaymentEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRPaymentEntity.java
index 638464d0e..d4f2a03bb 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRPaymentEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRPaymentEntity.java
@@ -20,9 +20,9 @@
 
 import java.math.BigDecimal;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRProductEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRProductEntity.java
index 15414b788..1a2fc2a54 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRProductEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRProductEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRReceiptEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRReceiptEntity.java
index 7ccaebac6..71d755e86 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRReceiptEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRReceiptEntity.java
@@ -20,10 +20,10 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRReceiptEntryEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRReceiptEntryEntity.java
index c359babf9..16ec9e579 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRReceiptEntryEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRReceiptEntryEntity.java
@@ -18,10 +18,10 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRRegionContextEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRRegionContextEntity.java
index 0ffd08660..db1db47c2 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRRegionContextEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRRegionContextEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRShippingPointEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRShippingPointEntity.java
index 5a3e18970..a26503f7f 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRShippingPointEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRShippingPointEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRSimpleInvoiceEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRSimpleInvoiceEntity.java
index dcfd56f1e..d45af55a5 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRSimpleInvoiceEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRSimpleInvoiceEntity.java
@@ -20,9 +20,9 @@
 
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRSupplierEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRSupplierEntity.java
index 44eaab081..cde472f99 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRSupplierEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRSupplierEntity.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRTaxEntity.java b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRTaxEntity.java
index bf7564d33..8e7e6c71a 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRTaxEntity.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/persistence/entities/jpa/JPAFRTaxEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.france.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRAddressBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRAddressBuilderImpl.java
index fa90b19ad..b06e46b82 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRAddressBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRAddressBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.AddressBuilderImpl;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRApplicationBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRApplicationBuilderImpl.java
index 63ca272a0..cfd2b1974 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRApplicationBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRApplicationBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ApplicationBuilderImpl;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRBusinessBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRBusinessBuilderImpl.java
index 41a4232df..ca29b57e7 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRBusinessBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRBusinessBuilderImpl.java
@@ -32,7 +32,7 @@
 import com.premiumminds.billy.france.services.entities.FRBusiness;
 import com.premiumminds.billy.france.util.FRFinancialValidator;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRContactBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRContactBuilderImpl.java
index f97676df8..fbdbb03d3 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRContactBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRContactBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ContactBuilderImpl;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRCustomerBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRCustomerBuilderImpl.java
index 182be30cd..e379d4a11 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRCustomerBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRCustomerBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.exceptions.InvalidTaxIdentificationNumberException;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRInvoiceEntryBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRInvoiceEntryBuilderImpl.java
index e1e6aefbd..ae3a36632 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRInvoiceEntryBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRInvoiceEntryBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice.CreditOrDebit;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRPaymentBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRPaymentBuilderImpl.java
index 25d5e944a..8ecfcdcb5 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRPaymentBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRPaymentBuilderImpl.java
@@ -21,7 +21,7 @@
 import java.math.BigDecimal;
 import java.util.Date;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.PaymentBuilderImpl;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRProductBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRProductBuilderImpl.java
index 753572130..ebc076898 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRProductBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRProductBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ProductBuilderImpl;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRRegionContextBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRRegionContextBuilderImpl.java
index 602a564c4..897d35fd9 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRRegionContextBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRRegionContextBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.builders.impl.ContextBuilderImpl;
 import com.premiumminds.billy.core.util.Localizer;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRShippingPointBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRShippingPointBuilderImpl.java
index 1f1fbae88..46c5ac8bd 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRShippingPointBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRShippingPointBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ShippingPointBuilderImpl;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRSupplierBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRSupplierBuilderImpl.java
index 1061667b9..bd3ee4214 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRSupplierBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRSupplierBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.exceptions.InvalidTaxIdentificationNumberException;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRTaxBuilderImpl.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRTaxBuilderImpl.java
index 69e067719..8b378a0b2 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRTaxBuilderImpl.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/builders/impl/FRTaxBuilderImpl.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.france.services.builders.impl;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.TaxBuilderImpl;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRCreditNoteIssuingHandler.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRCreditNoteIssuingHandler.java
index 214baee91..14042ed43 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRCreditNoteIssuingHandler.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRCreditNoteIssuingHandler.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.france.services.documents;
 
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRCreditReceiptIssuingHandler.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRCreditReceiptIssuingHandler.java
index fca53c87d..09286eae8 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRCreditReceiptIssuingHandler.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRCreditReceiptIssuingHandler.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.france.services.documents;
 
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRGenericInvoiceIssuingHandler.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRGenericInvoiceIssuingHandler.java
index 53eaaacbe..60777d623 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRGenericInvoiceIssuingHandler.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRGenericInvoiceIssuingHandler.java
@@ -23,8 +23,8 @@
 import java.util.Date;
 
 import java.util.Optional;
-import javax.inject.Inject;
-import javax.persistence.LockModeType;
+import jakarta.inject.Inject;
+import jakarta.persistence.LockModeType;
 
 import com.premiumminds.billy.core.persistence.dao.AbstractDAOGenericInvoice;
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRInvoiceIssuingHandler.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRInvoiceIssuingHandler.java
index 9fa132cc8..57b7f5888 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRInvoiceIssuingHandler.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRInvoiceIssuingHandler.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.france.services.documents;
 
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRReceiptIssuingHandler.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRReceiptIssuingHandler.java
index fe99be48e..3745a27e0 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRReceiptIssuingHandler.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRReceiptIssuingHandler.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.france.services.documents;
 
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRSimpleInvoiceIssuingHandler.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRSimpleInvoiceIssuingHandler.java
index 0148461dd..5dd611364 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRSimpleInvoiceIssuingHandler.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/documents/FRSimpleInvoiceIssuingHandler.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.france.services.documents;
 
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRAddress.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRAddress.java
index 339757e98..1846c23bd 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRAddress.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRAddress.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Address;
 import com.premiumminds.billy.france.persistence.dao.DAOFRAddress;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRApplication.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRApplication.java
index 286d94db5..56e209a59 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRApplication.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRApplication.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Application;
 import com.premiumminds.billy.france.persistence.dao.DAOFRApplication;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRBusiness.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRBusiness.java
index 2d3c8e0b5..e4b6af1d7 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRBusiness.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRBusiness.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Business;
 import com.premiumminds.billy.france.persistence.dao.DAOFRBusiness;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRContact.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRContact.java
index a89718e26..2e0342cfe 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRContact.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRContact.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Contact;
 import com.premiumminds.billy.france.persistence.dao.DAOFRContact;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditNote.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditNote.java
index e656c8ce7..3ad7b757a 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditNote.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditNote.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRBusiness;
 import com.premiumminds.billy.france.persistence.dao.DAOFRCreditNote;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditNoteEntry.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditNoteEntry.java
index 53d1078d3..2ea5f597a 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditNoteEntry.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditNoteEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRCreditNoteEntry;
 import com.premiumminds.billy.france.persistence.dao.DAOFRInvoice;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditReceipt.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditReceipt.java
index d107d26ab..133e30332 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditReceipt.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditReceipt.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRBusiness;
 import com.premiumminds.billy.france.persistence.dao.DAOFRCreditReceipt;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditReceiptEntry.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditReceiptEntry.java
index fe1125d9b..8d5dc5d32 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditReceiptEntry.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCreditReceiptEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRCreditReceiptEntry;
 import com.premiumminds.billy.france.persistence.dao.DAOFRProduct;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCustomer.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCustomer.java
index 1c4a9eccc..f4f4cc9a8 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCustomer.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRCustomer.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Customer;
 import com.premiumminds.billy.france.persistence.dao.DAOFRContact;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRGenericInvoice.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRGenericInvoice.java
index 7d6644372..08d2a992e 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRGenericInvoice.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRGenericInvoice.java
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRGenericInvoiceEntry.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRGenericInvoiceEntry.java
index e5b167446..d2b67def5 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRGenericInvoiceEntry.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRGenericInvoiceEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
 import com.premiumminds.billy.france.persistence.dao.DAOFRGenericInvoice;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRInvoice.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRInvoice.java
index ba28962b4..6e02ada56 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRInvoice.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRInvoice.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.france.services.entities;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRInvoiceEntry.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRInvoiceEntry.java
index 1bdf5cb1f..e65e894fa 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRInvoiceEntry.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRInvoiceEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRInvoice;
 import com.premiumminds.billy.france.persistence.dao.DAOFRInvoiceEntry;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRPayment.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRPayment.java
index 6cfd4a7e2..40d78f501 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRPayment.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRPayment.java
@@ -20,7 +20,7 @@
 
 import java.math.BigDecimal;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.util.PaymentMechanism;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRProduct.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRProduct.java
index c53043a9d..3793e61f3 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRProduct.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRProduct.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Product;
 import com.premiumminds.billy.france.persistence.dao.DAOFRProduct;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRReceipt.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRReceipt.java
index ed5b0a906..dd8cbadc3 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRReceipt.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRReceipt.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.france.services.entities;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRReceiptEntry.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRReceiptEntry.java
index b429a37d6..a35a55253 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRReceiptEntry.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRReceiptEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRProduct;
 import com.premiumminds.billy.france.persistence.dao.DAOFRReceipt;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRRegionContext.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRRegionContext.java
index 075b5ad92..7f19111f2 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRRegionContext.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRRegionContext.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Context;
 import com.premiumminds.billy.france.persistence.dao.DAOFRRegionContext;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRShippingPoint.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRShippingPoint.java
index e9b302a74..73492a90a 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRShippingPoint.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRShippingPoint.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.ShippingPoint;
 import com.premiumminds.billy.france.persistence.dao.DAOFRShippingPoint;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRSimpleInvoice.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRSimpleInvoice.java
index f24157b10..478e624a9 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRSimpleInvoice.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRSimpleInvoice.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.france.persistence.dao.DAOFRBusiness;
 import com.premiumminds.billy.france.persistence.dao.DAOFRCustomer;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRSupplier.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRSupplier.java
index 4756d3b93..35972dc86 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRSupplier.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRSupplier.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Supplier;
 import com.premiumminds.billy.france.persistence.dao.DAOFRSupplier;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRTax.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRTax.java
index c1022b015..45daef63f 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRTax.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/entities/FRTax.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Tax;
 import com.premiumminds.billy.france.persistence.dao.DAOFRRegionContext;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRCreditNoteDataExtractor.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRCreditNoteDataExtractor.java
index 981aa05df..5a3dc4a1b 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRCreditNoteDataExtractor.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRCreditNoteDataExtractor.java
@@ -20,7 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRCreditReceiptDataExtractor.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRCreditReceiptDataExtractor.java
index cd4cfd0b8..7363a0d25 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRCreditReceiptDataExtractor.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRCreditReceiptDataExtractor.java
@@ -20,7 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRInvoiceDataExtractor.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRInvoiceDataExtractor.java
index 0820bae73..bb5c12e3f 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRInvoiceDataExtractor.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRInvoiceDataExtractor.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.france.services.export;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRReceiptDataExtractor.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRReceiptDataExtractor.java
index 5fd15f18f..fa8712fc1 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRReceiptDataExtractor.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRReceiptDataExtractor.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.france.services.export;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRSimpleInvoiceDataExtractor.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRSimpleInvoiceDataExtractor.java
index 6963340f7..0d6e21b16 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRSimpleInvoiceDataExtractor.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/export/FRSimpleInvoiceDataExtractor.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.france.services.export;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRApplicationPersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRApplicationPersistenceService.java
index fbdff8f2b..24cb491cf 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRApplicationPersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRApplicationPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRBusinessPersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRBusinessPersistenceService.java
index 30e0ea64e..96ca01cf5 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRBusinessPersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRBusinessPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCreditNotePersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCreditNotePersistenceService.java
index 4898fc412..1aa0468e0 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCreditNotePersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCreditNotePersistenceService.java
@@ -19,8 +19,8 @@
 package com.premiumminds.billy.france.services.persistence;
 
 import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCreditReceiptPersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCreditReceiptPersistenceService.java
index 619be2c26..a00fdc755 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCreditReceiptPersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCreditReceiptPersistenceService.java
@@ -19,8 +19,8 @@
 package com.premiumminds.billy.france.services.persistence;
 
 import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCustomerPersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCustomerPersistenceService.java
index 2585e13e7..a376c8023 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCustomerPersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRCustomerPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRInvoicePersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRInvoicePersistenceService.java
index 228f4726f..99e48a42c 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRInvoicePersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRInvoicePersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRProductPersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRProductPersistenceService.java
index 7589bea28..f61123322 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRProductPersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRProductPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRReceiptPersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRReceiptPersistenceService.java
index a4d9d52c1..e9803a94c 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRReceiptPersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRReceiptPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRRegionContextPersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRRegionContextPersistenceService.java
index c3d79c9fd..82ad69669 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRRegionContextPersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRRegionContextPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRSimpleInvoicePersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRSimpleInvoicePersistenceService.java
index 8a0ecc33f..d12ef13d6 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRSimpleInvoicePersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRSimpleInvoicePersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRSupplierPersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRSupplierPersistenceService.java
index 6ebc018c9..e609931d1 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRSupplierPersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRSupplierPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRTaxPersistenceService.java b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRTaxPersistenceService.java
index e8db9d693..05cf6d59c 100644
--- a/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRTaxPersistenceService.java
+++ b/billy-france/src/main/java/com/premiumminds/billy/france/services/persistence/FRTaxPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.france.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-france/src/main/java/com/premiumminds/billy/france/util/SchemaExport.java b/billy-france/src/main/java/com/premiumminds/billy/france/util/SchemaExport.java
deleted file mode 100644
index 0106d9c4b..000000000
--- a/billy-france/src/main/java/com/premiumminds/billy/france/util/SchemaExport.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2017 Premium Minds.
- *
- * This file is part of billy france (FR Pack).
- *
- * billy france (FR Pack) is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * billy france (FR Pack) is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with billy france (FR Pack). If not, see <http://www.gnu.org/licenses/>.
- */
-package com.premiumminds.billy.france.util;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
-import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
-import org.hibernate.jpa.boot.internal.PersistenceXmlParser;
-import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
-import org.hibernate.jpa.boot.spi.ProviderChecker;
-import org.hibernate.tool.schema.TargetType;
-
-public class SchemaExport {
-
-    public static void main(String[] args) {
-        SchemaExport
-            .exportSchema(args[0], args[1], args[2], args[3], args[4], args[5]);
-    }
-
-    private static void exportSchema(String persistenceUnit, String url, String username, String password,
-        String outputDir, String delimiter) {
-
-        File file = new File(outputDir);
-        new File(file.getParent()).mkdirs();
-
-        Map<String, Object> properties = setupProperties(url, username, password);
-        EntityManagerFactoryBuilderImpl entityManagerFactoryBuilder =
-            getEntityManagerFactoryBuilderOrNull(persistenceUnit, properties);
-
-        EntityManagerFactory factory = entityManagerFactoryBuilder.build();
-        MetadataImplementor metaData = entityManagerFactoryBuilder.getMetadata();
-
-        org.hibernate.tool.hbm2ddl.SchemaExport se = new org.hibernate.tool.hbm2ddl.SchemaExport();
-        se.setOutputFile(outputDir);
-        se.setFormat(true);
-        se.setDelimiter(delimiter);
-        se.execute(EnumSet.of(TargetType.SCRIPT), org.hibernate.tool.hbm2ddl.SchemaExport.Action.CREATE, metaData);
-
-        factory.close();
-    }
-
-    private static Map<String, Object> setupProperties(String url, String username, String password) {
-        Map<String, Object>  properties = new HashMap<>();
-        properties.put("javax.persistence.jdbc.url", url);
-        properties.put("javax.persistence.jdbc.user", username);
-        properties.put("javax.persistence.jdbc.password", password);
-
-        return Collections.unmodifiableMap(properties);
-    }
-
-    private static EntityManagerFactoryBuilderImpl getEntityManagerFactoryBuilderOrNull(String persistenceUnitName,
-        Map<String, Object> properties) {
-
-        final List<ParsedPersistenceXmlDescriptor> units;
-        try {
-            units = PersistenceXmlParser.locatePersistenceUnits(properties);
-        } catch (Exception e) {
-            throw new PersistenceException("Unable to locate persistence units", e);
-        }
-
-        if (persistenceUnitName == null && units.size() > 1) {
-            throw new PersistenceException("No name provided and multiple persistence units found");
-        }
-
-        for (ParsedPersistenceXmlDescriptor persistenceUnit : units) {
-            final boolean matches = persistenceUnitName == null || persistenceUnit.getName().equals(persistenceUnitName);
-            if (!matches) {
-                continue;
-            }
-
-            if (!ProviderChecker.isProvider(persistenceUnit, properties)) {
-                continue;
-            }
-
-            return getEntityManagerFactoryBuilder(persistenceUnit, properties, null);
-        }
-
-        return null;
-    }
-
-    private static EntityManagerFactoryBuilderImpl getEntityManagerFactoryBuilder(
-        PersistenceUnitDescriptor persistenceUnitDescriptor, Map<String, Object> integration,
-        ClassLoader providedClassLoader) {
-        return new EntityManagerFactoryBuilderImpl(persistenceUnitDescriptor, integration, providedClassLoader);
-    }
-}
diff --git a/billy-france/src/test/java/com/premiumminds/billy/france/test/FranceTestPersistenceDependencyModule.java b/billy-france/src/test/java/com/premiumminds/billy/france/test/FranceTestPersistenceDependencyModule.java
index 026805046..04d6e8def 100644
--- a/billy-france/src/test/java/com/premiumminds/billy/france/test/FranceTestPersistenceDependencyModule.java
+++ b/billy-france/src/test/java/com/premiumminds/billy/france/test/FranceTestPersistenceDependencyModule.java
@@ -22,12 +22,14 @@
 import com.google.inject.Inject;
 import com.google.inject.persist.PersistService;
 import com.google.inject.persist.jpa.JpaPersistModule;
+import com.google.inject.persist.jpa.JpaPersistOptions;
 
 public class FranceTestPersistenceDependencyModule extends AbstractModule {
 
     @Override
     protected void configure() {
-        JpaPersistModule persistModule = new JpaPersistModule("BillyFranceTestPersistenceUnit");
+        final var options = JpaPersistOptions.builder().setAutoBeginWorkOnEntityManagerCreation(true).build();
+        JpaPersistModule persistModule = new JpaPersistModule("BillyFranceTestPersistenceUnit", options);
         this.install(persistModule);
     }
 
diff --git a/billy-france/src/test/java/com/premiumminds/billy/france/test/services/dao/TestDAOFRInvoice.java b/billy-france/src/test/java/com/premiumminds/billy/france/test/services/dao/TestDAOFRInvoice.java
index 8a4e38027..aed79cd76 100644
--- a/billy-france/src/test/java/com/premiumminds/billy/france/test/services/dao/TestDAOFRInvoice.java
+++ b/billy-france/src/test/java/com/premiumminds/billy/france/test/services/dao/TestDAOFRInvoice.java
@@ -20,7 +20,7 @@
 
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/billy-france/src/test/java/com/premiumminds/billy/france/test/util/FRBusinessTestUtil.java b/billy-france/src/test/java/com/premiumminds/billy/france/test/util/FRBusinessTestUtil.java
index 486546cc1..112d841f6 100644
--- a/billy-france/src/test/java/com/premiumminds/billy/france/test/util/FRBusinessTestUtil.java
+++ b/billy-france/src/test/java/com/premiumminds/billy/france/test/util/FRBusinessTestUtil.java
@@ -30,7 +30,7 @@
 import com.premiumminds.billy.france.services.entities.FRRegionContext;
 import com.premiumminds.billy.france.util.Contexts;
 
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import java.net.MalformedURLException;
 import java.time.ZoneId;
 import java.util.UUID;
diff --git a/billy-france/src/test/resources/META-INF/persistence.xml b/billy-france/src/test/resources/META-INF/persistence.xml
index 0a6085466..b8615b353 100644
--- a/billy-france/src/test/resources/META-INF/persistence.xml
+++ b/billy-france/src/test/resources/META-INF/persistence.xml
@@ -41,14 +41,13 @@
 		<mapping-file>META-INF/orm-core.xml</mapping-file>
 		<mapping-file>META-INF/orm-france.xml</mapping-file>
 		<properties>
-			<property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-			<property name="javax.persistence.jdbc.url" value="jdbc:h2:/tmp/h2db" />
-			<property name="javax.persistence.jdbc.user" value="billytest" />
-			<property name="javax.persistence.jdbc.password" value="billytest" />
+			<property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver" />
+			<property name="jakarta.persistence.jdbc.url" value="jdbc:h2:/tmp/h2db" />
+			<property name="jakarta.persistence.jdbc.user" value="billytest" />
+			<property name="jakarta.persistence.jdbc.password" value="billytest" />
 
 			<property name="hibernate.show_sql" value="false" />
 			<property name="hibernate.hbm2ddl.auto" value="create" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
 			<property name="hibernate.globally_quoted_identifiers" value="true"/>
 		</properties>
 	</persistence-unit>
diff --git a/billy-portugal/pom.xml b/billy-portugal/pom.xml
index d56a69134..89e0242b5 100644
--- a/billy-portugal/pom.xml
+++ b/billy-portugal/pom.xml
@@ -52,12 +52,12 @@
 
 		<!-- PERSISTENCE -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-envers</artifactId>
 		</dependency>
 
@@ -66,6 +66,7 @@
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-jpa</artifactId>
 			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
 			<scope>provided</scope>
 		</dependency>
 
@@ -97,18 +98,12 @@
 		<dependency>
 			<groupId>jakarta.xml.ws</groupId>
 			<artifactId>jakarta.xml.ws-api</artifactId>
-			<version>2.3.3</version>
-			<exclusions>
-				<exclusion>
-					<groupId>jakarta.activation</groupId>
-					<artifactId>jakarta.activation-api</artifactId>
-				</exclusion>
-			</exclusions>
+			<version>3.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.jws</groupId>
 			<artifactId>jakarta.jws-api</artifactId>
-			<version>2.1.0</version>
+			<version>3.0.0</version>
 		</dependency>
 
 		<!-- JUNIT -->
@@ -150,14 +145,8 @@
 		<dependency>
 			<groupId>com.sun.xml.ws</groupId>
 			<artifactId>jaxws-rt</artifactId>
-			<version>2.3.6</version>
+			<version>3.0.2</version>
 			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>com.sun.activation</groupId>
-					<artifactId>jakarta.activation</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 	</dependencies>
@@ -209,20 +198,14 @@
 						<groupId>com.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
 						<version>${querydsl.version}</version>
+						<classifier>jakarta</classifier>
 					</dependency>
 				</dependencies>
 			</plugin>
 			<plugin>
 				<!-- When adding support for additional SAFT version via .xsd, create a separate execution element, as done below -->
-				<groupId>org.jvnet.jaxb2.maven2</groupId>
-				<artifactId>maven-jaxb2-plugin</artifactId>
-				<dependencies>
-					<dependency>
-						<groupId>org.glassfish.jaxb</groupId>
-						<artifactId>jaxb-runtime</artifactId>
-						<version>2.3.5</version>
-					</dependency>
-				</dependencies>
+				<groupId>org.jvnet.jaxb</groupId>
+				<artifactId>jaxb-maven-plugin</artifactId>
 				<configuration>
 					<schemaDirectory>src/main/resources/documents</schemaDirectory>
 					<bindingDirectory>src/main/resources/documents</bindingDirectory>
@@ -230,22 +213,6 @@
 					<strict>false</strict>
 					<extension>true</extension>
 					<forceRegenerate>true</forceRegenerate>
-					<plugins>
-						<plugin>
-							<groupId>org.jvnet.jaxb2_commons</groupId>
-							<artifactId>jaxb2-basics</artifactId>
-							<version>0.13.1</version>
-						</plugin>
-						<plugin>
-							<groupId>org.jvnet.jaxb2_commons</groupId>
-							<artifactId>jaxb2-basics-annotate</artifactId>
-							<version>1.1.0</version>
-						</plugin>
-					</plugins>
-					<args>
-						<arg>-Xannotate</arg>
-						<arg>-XtoString</arg>
-					</args>
 				</configuration>
 				<executions>
 					<execution>
@@ -284,9 +251,9 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
+				<groupId>com.sun.xml.ws</groupId>
 				<artifactId>jaxws-maven-plugin</artifactId>
-				<version>2.6</version>
+				<version>3.0.2</version>
 				<executions>
 					<execution>
 						<id>documents</id>
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/BillyPortugal.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/BillyPortugal.java
index fc1fde067..560103ef4 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/BillyPortugal.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/BillyPortugal.java
@@ -19,8 +19,8 @@
 package com.premiumminds.billy.portugal;
 
 import com.premiumminds.billy.portugal.util.ReceiptInvoices;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/PortugalPersistenceDependencyModule.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/PortugalPersistenceDependencyModule.java
index 8ba57550b..4a1b21bc7 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/PortugalPersistenceDependencyModule.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/PortugalPersistenceDependencyModule.java
@@ -22,6 +22,7 @@
 import com.google.inject.Inject;
 import com.google.inject.persist.PersistService;
 import com.google.inject.persist.jpa.JpaPersistModule;
+import com.google.inject.persist.jpa.JpaPersistOptions;
 
 public class PortugalPersistenceDependencyModule extends AbstractModule {
 
@@ -33,7 +34,8 @@ public PortugalPersistenceDependencyModule(String persistenceUnitId) {
 
     @Override
     protected void configure() {
-        JpaPersistModule persistModule = new JpaPersistModule(this.persistenceUnitId);
+        final var options = JpaPersistOptions.builder().setAutoBeginWorkOnEntityManagerCreation(true).build();
+        JpaPersistModule persistModule = new JpaPersistModule(this.persistenceUnitId, options);
         this.install(persistModule);
     }
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/AbstractDAOPTGenericInvoiceEntryImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/AbstractDAOPTGenericInvoiceEntryImpl.java
index 4e34dfb3c..63acd626e 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/AbstractDAOPTGenericInvoiceEntryImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/AbstractDAOPTGenericInvoiceEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.AbstractDAOGenericInvoiceEntryImpl;
 import com.premiumminds.billy.portugal.persistence.dao.AbstractDAOPTGenericInvoiceEntry;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/AbstractDAOPTGenericInvoiceImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/AbstractDAOPTGenericInvoiceImpl.java
index c8189bea7..d79203771 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/AbstractDAOPTGenericInvoiceImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/AbstractDAOPTGenericInvoiceImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTAddressImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTAddressImpl.java
index 1004c3b91..ae1170582 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTAddressImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTAddressImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOAddressImpl;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTAddress;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTApplicationImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTApplicationImpl.java
index 399fa1968..cbc9b6077 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTApplicationImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTApplicationImpl.java
@@ -18,10 +18,10 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Application;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTBusinessImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTBusinessImpl.java
index e9e0cf7c1..91efe283d 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTBusinessImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTBusinessImpl.java
@@ -18,10 +18,10 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTContactImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTContactImpl.java
index 8c43fadc0..2eea39640 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTContactImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTContactImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOContactImpl;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTContact;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCreditNoteEntryImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCreditNoteEntryImpl.java
index ab286b320..bbee035ed 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCreditNoteEntryImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCreditNoteEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTCreditNoteEntry;
 import com.premiumminds.billy.portugal.persistence.entities.PTCreditNoteEntity;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCreditNoteImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCreditNoteImpl.java
index 2f695bb8b..80d5ac224 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCreditNoteImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCreditNoteImpl.java
@@ -35,9 +35,9 @@
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 public class DAOPTCreditNoteImpl extends AbstractDAOPTGenericInvoiceImpl<PTCreditNoteEntity, JPAPTCreditNoteEntity>
         implements DAOPTCreditNote {
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCustomerImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCustomerImpl.java
index 366793849..6389c3140 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCustomerImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTCustomerImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOCustomerImpl;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTCustomer;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTGenericInvoiceEntryImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTGenericInvoiceEntryImpl.java
index 8a668a67d..1bc1ebfd2 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTGenericInvoiceEntryImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTGenericInvoiceEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.AbstractDAOGenericInvoiceEntryImpl;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTGenericInvoiceEntry;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTGenericInvoiceImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTGenericInvoiceImpl.java
index baa9a7521..b500f4452 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTGenericInvoiceImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTGenericInvoiceImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTGenericInvoice;
 import com.premiumminds.billy.portugal.persistence.entities.PTGenericInvoiceEntity;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTInvoiceEntryImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTInvoiceEntryImpl.java
index ad4955be4..78b306f80 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTInvoiceEntryImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTInvoiceEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTInvoiceEntry;
 import com.premiumminds.billy.portugal.persistence.entities.PTInvoiceEntryEntity;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTInvoiceImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTInvoiceImpl.java
index 5b8fd20a8..b6002962a 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTInvoiceImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTInvoiceImpl.java
@@ -28,9 +28,9 @@
 import com.querydsl.jpa.impl.JPAQuery;
 import java.time.LocalDate;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 public class DAOPTInvoiceImpl extends AbstractDAOPTGenericInvoiceImpl<PTInvoiceEntity, JPAPTInvoiceEntity>
         implements DAOPTInvoice {
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTPaymentImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTPaymentImpl.java
index 1bfc7332d..64427a683 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTPaymentImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTPaymentImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOPaymentImpl;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTPayment;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTProductImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTProductImpl.java
index cb4e51dcc..b68ccc03b 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTProductImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTProductImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOProductImpl;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTProduct;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTReceiptInvoiceImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTReceiptInvoiceImpl.java
index 27454d301..430ef57e0 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTReceiptInvoiceImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTReceiptInvoiceImpl.java
@@ -28,9 +28,9 @@
 import com.querydsl.jpa.impl.JPAQuery;
 import java.time.LocalDate;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 public class DAOPTReceiptInvoiceImpl
         extends AbstractDAOPTGenericInvoiceImpl<PTReceiptInvoiceEntity, JPAPTReceiptInvoiceEntity>
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTRegionContextImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTRegionContextImpl.java
index b7e2b6c37..ce5b80744 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTRegionContextImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTRegionContextImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOContextImpl;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTRegionContext;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTShippingPointImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTShippingPointImpl.java
index fd11d461c..60cb2a069 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTShippingPointImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTShippingPointImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOShippingPointImpl;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTShippingPoint;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTSimpleInvoiceImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTSimpleInvoiceImpl.java
index 2a7246567..c003174e2 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTSimpleInvoiceImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTSimpleInvoiceImpl.java
@@ -28,9 +28,9 @@
 import com.querydsl.jpa.impl.JPAQuery;
 import java.time.LocalDate;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 public class DAOPTSimpleInvoiceImpl extends
         AbstractDAOPTGenericInvoiceImpl<PTSimpleInvoiceEntity, JPAPTSimpleInvoiceEntity> implements DAOPTSimpleInvoice {
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTSupplierImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTSupplierImpl.java
index d62c8baef..d321b4a7a 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTSupplierImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTSupplierImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOSupplierImpl;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTSupplier;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTTaxImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTTaxImpl.java
index e290e9504..17ee4d71f 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTTaxImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/dao/jpa/DAOPTTaxImpl.java
@@ -24,9 +24,9 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOTaxImpl;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTTax;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTAddressEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTAddressEntity.java
index 5505ee7dd..9f77d8f34 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTAddressEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTAddressEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTApplicationEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTApplicationEntity.java
index 0a7b44d19..8be19a5cf 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTApplicationEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTApplicationEntity.java
@@ -22,10 +22,10 @@
 import java.net.URL;
 import java.util.List;
 
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTBusinessEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTBusinessEntity.java
index 1b33478b8..99e3b71f4 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTBusinessEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTBusinessEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTContactEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTContactEntity.java
index 8ae3f59eb..6b3aec044 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTContactEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTContactEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCreditNoteEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCreditNoteEntity.java
index a1885b000..1e21cd81a 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCreditNoteEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCreditNoteEntity.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCreditNoteEntryEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCreditNoteEntryEntity.java
index 92c640532..d79a24866 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCreditNoteEntryEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCreditNoteEntryEntity.java
@@ -18,13 +18,13 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCustomerEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCustomerEntity.java
index b80e10173..56f4779dd 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCustomerEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTCustomerEntity.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTGenericInvoiceEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTGenericInvoiceEntity.java
index 32eaa561b..a7d951d93 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTGenericInvoiceEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTGenericInvoiceEntity.java
@@ -20,9 +20,9 @@
 
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTGenericInvoiceEntryEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTGenericInvoiceEntryEntity.java
index 79c06fc32..1dca8bfe9 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTGenericInvoiceEntryEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTGenericInvoiceEntryEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTInvoiceEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTInvoiceEntity.java
index fa6a277fa..f39c39d37 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTInvoiceEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTInvoiceEntity.java
@@ -20,10 +20,10 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTInvoiceEntryEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTInvoiceEntryEntity.java
index 6692c77db..d62d353fc 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTInvoiceEntryEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTInvoiceEntryEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTPaymentEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTPaymentEntity.java
index aef9b3d68..20321469f 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTPaymentEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTPaymentEntity.java
@@ -20,9 +20,9 @@
 
 import java.math.BigDecimal;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTProductEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTProductEntity.java
index f702ab977..13970a233 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTProductEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTProductEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTReceiptInvoiceEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTReceiptInvoiceEntity.java
index efaba7517..daca2e5d9 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTReceiptInvoiceEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTReceiptInvoiceEntity.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTRegionContextEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTRegionContextEntity.java
index 5d95b6817..f3d61536a 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTRegionContextEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTRegionContextEntity.java
@@ -18,10 +18,10 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTShippingPointEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTShippingPointEntity.java
index c20c70a2e..5f5350fad 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTShippingPointEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTShippingPointEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTSimpleInvoiceEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTSimpleInvoiceEntity.java
index a2ce9bda7..74e71fd67 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTSimpleInvoiceEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTSimpleInvoiceEntity.java
@@ -20,9 +20,9 @@
 
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTSupplierEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTSupplierEntity.java
index 5535b846e..12ee346a3 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTSupplierEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTSupplierEntity.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTTaxEntity.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTTaxEntity.java
index feeae9d86..5c1b20bb3 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTTaxEntity.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/persistence/entities/jpa/JPAPTTaxEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.portugal.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTAddressBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTAddressBuilderImpl.java
index 529baa9a3..783fb85b6 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTAddressBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTAddressBuilderImpl.java
@@ -20,7 +20,7 @@
 
 import java.util.Arrays;
 import java.util.Locale;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.AddressBuilderImpl;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTApplicationBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTApplicationBuilderImpl.java
index a7cd8415a..4fca36638 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTApplicationBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTApplicationBuilderImpl.java
@@ -20,7 +20,7 @@
 
 import java.net.URL;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ApplicationBuilderImpl;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTBusinessBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTBusinessBuilderImpl.java
index dd1dfb7b3..31e4ec999 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTBusinessBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTBusinessBuilderImpl.java
@@ -32,7 +32,7 @@
 import com.premiumminds.billy.portugal.services.entities.PTBusiness;
 import com.premiumminds.billy.portugal.util.PTFinancialValidator;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTContactBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTContactBuilderImpl.java
index df38d879d..77697bcad 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTContactBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTContactBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ContactBuilderImpl;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTCustomerBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTCustomerBuilderImpl.java
index b24aa76a8..8c3b7e201 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTCustomerBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTCustomerBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.exceptions.InvalidTaxIdentificationNumberException;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTInvoiceEntryBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTInvoiceEntryBuilderImpl.java
index 3eda26385..e128752f5 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTInvoiceEntryBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTInvoiceEntryBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice.CreditOrDebit;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTManualInvoiceBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTManualInvoiceBuilderImpl.java
index d42043d62..faab659db 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTManualInvoiceBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTManualInvoiceBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice.CreditOrDebit;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTPaymentBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTPaymentBuilderImpl.java
index b476f01b1..1aa1c18ab 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTPaymentBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTPaymentBuilderImpl.java
@@ -21,7 +21,7 @@
 import java.math.BigDecimal;
 import java.util.Date;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.PaymentBuilderImpl;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTProductBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTProductBuilderImpl.java
index 0d47011a8..d186c894e 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTProductBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTProductBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ProductBuilderImpl;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTRegionContextBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTRegionContextBuilderImpl.java
index 88645ff84..cc761e67b 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTRegionContextBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTRegionContextBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ContextBuilderImpl;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTShippingPointBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTShippingPointBuilderImpl.java
index 54338d204..709177d10 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTShippingPointBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTShippingPointBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ShippingPointBuilderImpl;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTSupplierBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTSupplierBuilderImpl.java
index fd6a245d2..80c1d1348 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTSupplierBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTSupplierBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.exceptions.InvalidTaxIdentificationNumberException;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTTaxBuilderImpl.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTTaxBuilderImpl.java
index 52b0e3bdb..41b4b8e12 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTTaxBuilderImpl.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/builders/impl/PTTaxBuilderImpl.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.portugal.services.builders.impl;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.TaxBuilderImpl;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTCreditNoteIssuingHandler.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTCreditNoteIssuingHandler.java
index 2645d46bd..4ff0d8879 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTCreditNoteIssuingHandler.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTCreditNoteIssuingHandler.java
@@ -20,7 +20,7 @@
 
 import com.premiumminds.billy.core.exceptions.SeriesUniqueCodeNotFilled;
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTGenericInvoiceIssuingHandler.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTGenericInvoiceIssuingHandler.java
index 03cd7cb3d..4573dab27 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTGenericInvoiceIssuingHandler.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTGenericInvoiceIssuingHandler.java
@@ -38,8 +38,8 @@
 import java.time.ZoneId;
 import java.util.Date;
 import java.util.Optional;
-import javax.inject.Inject;
-import javax.persistence.LockModeType;
+import jakarta.inject.Inject;
+import jakarta.persistence.LockModeType;
 
 public abstract class PTGenericInvoiceIssuingHandler<T extends PTGenericInvoiceEntity, P extends PTIssuingParams>
         implements DocumentIssuingHandler<T, P> {
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTInvoiceIssuingHandler.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTInvoiceIssuingHandler.java
index 627b1d6c9..f29b90cf9 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTInvoiceIssuingHandler.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTInvoiceIssuingHandler.java
@@ -20,7 +20,7 @@
 
 import com.premiumminds.billy.core.exceptions.SeriesUniqueCodeNotFilled;
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTReceiptInvoiceIssuingHandler.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTReceiptInvoiceIssuingHandler.java
index 222818553..0b08d9276 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTReceiptInvoiceIssuingHandler.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTReceiptInvoiceIssuingHandler.java
@@ -20,7 +20,7 @@
 
 import com.premiumminds.billy.core.exceptions.SeriesUniqueCodeNotFilled;
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTSimpleInvoiceIssuingHandler.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTSimpleInvoiceIssuingHandler.java
index c799a3c24..ade3f16dc 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTSimpleInvoiceIssuingHandler.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/documents/PTSimpleInvoiceIssuingHandler.java
@@ -20,7 +20,7 @@
 
 import com.premiumminds.billy.core.exceptions.SeriesUniqueCodeNotFilled;
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTAddress.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTAddress.java
index 3feefb9a4..a176ec734 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTAddress.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTAddress.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Address;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTAddress;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTApplication.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTApplication.java
index 422bdbd8a..a52f4f5e9 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTApplication.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTApplication.java
@@ -21,7 +21,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Application;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTApplication;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTBusiness.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTBusiness.java
index 90027398c..366d7afc7 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTBusiness.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTBusiness.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Business;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTBusiness;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTContact.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTContact.java
index 07e87a921..b62954640 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTContact.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTContact.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Contact;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTContact;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCreditNote.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCreditNote.java
index f0724fbfc..539f336c7 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCreditNote.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCreditNote.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTBusiness;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTCreditNote;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCreditNoteEntry.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCreditNoteEntry.java
index a88c4b461..5e741fae6 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCreditNoteEntry.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCreditNoteEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTCreditNoteEntry;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTInvoice;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCustomer.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCustomer.java
index e8f0f837c..e60556a15 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCustomer.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTCustomer.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Customer;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTContact;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTGenericInvoice.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTGenericInvoice.java
index ae1e1a158..eec2bdb0f 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTGenericInvoice.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTGenericInvoice.java
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTGenericInvoiceEntry.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTGenericInvoiceEntry.java
index a6033aa48..ff2d464ef 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTGenericInvoiceEntry.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTGenericInvoiceEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTGenericInvoice;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTInvoice.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTInvoice.java
index 6e82f1e87..034ca307a 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTInvoice.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTInvoice.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.portugal.services.entities;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTInvoiceEntry.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTInvoiceEntry.java
index 71452766a..8201d784a 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTInvoiceEntry.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTInvoiceEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTInvoice;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTInvoiceEntry;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTPayment.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTPayment.java
index afb8c6fde..414a78938 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTPayment.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTPayment.java
@@ -20,7 +20,7 @@
 
 import java.math.BigDecimal;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.util.PaymentMechanism;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTProduct.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTProduct.java
index 5bab43c44..12375f3d9 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTProduct.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTProduct.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Product;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTProduct;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTReceiptInvoice.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTReceiptInvoice.java
index cae8a1f8c..76a2d6391 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTReceiptInvoice.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTReceiptInvoice.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTBusiness;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTCustomer;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTRegionContext.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTRegionContext.java
index 380cfda56..47cd9fafe 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTRegionContext.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTRegionContext.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Context;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTRegionContext;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTShippingPoint.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTShippingPoint.java
index 1a695dbb9..ead0b80be 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTShippingPoint.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTShippingPoint.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.ShippingPoint;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTShippingPoint;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTSimpleInvoice.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTSimpleInvoice.java
index af30fcbb3..e3eea85c1 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTSimpleInvoice.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTSimpleInvoice.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTBusiness;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTCustomer;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTSupplier.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTSupplier.java
index a2e702ff1..930f46404 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTSupplier.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTSupplier.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Supplier;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTSupplier;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTTax.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTTax.java
index b40e9b1fc..d6c2a3568 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTTax.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/entities/PTTax.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Tax;
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTRegionContext;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTCreditNoteDataExtractor.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTCreditNoteDataExtractor.java
index 193dd6c1a..a906240ea 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTCreditNoteDataExtractor.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTCreditNoteDataExtractor.java
@@ -36,7 +36,7 @@
 import com.premiumminds.billy.portugal.services.export.qrcode.QRCodeStringGenerator;
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class PTCreditNoteDataExtractor extends AbstractBillyDataExtractor
         implements BillyDataExtractor<PTCreditNoteData> {
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTInvoiceDataExtractor.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTInvoiceDataExtractor.java
index e66376fef..237b0480c 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTInvoiceDataExtractor.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTInvoiceDataExtractor.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.portugal.services.export;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTReceiptInvoiceDataExtractor.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTReceiptInvoiceDataExtractor.java
index 392167fea..1d9087f9d 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTReceiptInvoiceDataExtractor.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTReceiptInvoiceDataExtractor.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.portugal.services.export;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTSimpleInvoiceDataExtractor.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTSimpleInvoiceDataExtractor.java
index 7d62f8e46..363daae29 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTSimpleInvoiceDataExtractor.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/PTSimpleInvoiceDataExtractor.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.portugal.services.export;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/qrcode/QRCodeStringGenerator.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/qrcode/QRCodeStringGenerator.java
index 6cf767087..10f3ac0a3 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/qrcode/QRCodeStringGenerator.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/qrcode/QRCodeStringGenerator.java
@@ -22,7 +22,7 @@
 import com.premiumminds.billy.portugal.Config.Key;
 import com.premiumminds.billy.portugal.services.entities.PTGenericInvoice;
 import com.premiumminds.billy.portugal.services.export.exceptions.RequiredFieldNotFoundException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class QRCodeStringGenerator {
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/PTSAFTFileGenerator.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/PTSAFTFileGenerator.java
index 828dcd617..5de2dca1c 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/PTSAFTFileGenerator.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/PTSAFTFileGenerator.java
@@ -21,7 +21,7 @@
 import java.io.OutputStream;
 import java.util.Date;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.portugal.persistence.entities.PTApplicationEntity;
 import com.premiumminds.billy.portugal.persistence.entities.PTBusinessEntity;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_02_01/PTSAFTFileGenerator.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_02_01/PTSAFTFileGenerator.java
index b931d0fac..0674fefcc 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_02_01/PTSAFTFileGenerator.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_02_01/PTSAFTFileGenerator.java
@@ -108,10 +108,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_03_01/PTSAFTFileGenerator.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_03_01/PTSAFTFileGenerator.java
index c367181fa..0f8ad2d1d 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_03_01/PTSAFTFileGenerator.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_03_01/PTSAFTFileGenerator.java
@@ -110,10 +110,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_04_01/PTSAFTFileGenerator.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_04_01/PTSAFTFileGenerator.java
index 0b2fb5333..de85fe3f2 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_04_01/PTSAFTFileGenerator.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/saftpt/v1_04_01/PTSAFTFileGenerator.java
@@ -102,10 +102,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/AuthenticationHandler.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/AuthenticationHandler.java
index ec006cb05..e7aae941e 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/AuthenticationHandler.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/AuthenticationHandler.java
@@ -40,14 +40,14 @@
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.SecretKeySpec;
 import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
+import jakarta.xml.soap.SOAPElement;
+import jakarta.xml.soap.SOAPEnvelope;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPFactory;
+import jakarta.xml.soap.SOAPHeader;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
 
 class AuthenticationHandler implements SOAPHandler<SOAPMessageContext>  {
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/Client.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/Client.java
index 49b7a6e92..60e2027e8 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/Client.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/Client.java
@@ -41,8 +41,8 @@
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.handler.Handler;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.handler.Handler;
 
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
 import com.premiumminds.billy.portugal.Config;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/ClientFactory.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/ClientFactory.java
index 355bc39c4..e829a9fb8 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/ClientFactory.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/export/webservice/ClientFactory.java
@@ -20,7 +20,7 @@
 
 import java.net.URL;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.portugal.Config;
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTApplicationPersistenceService.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTApplicationPersistenceService.java
index f08bf78f8..47f95e494 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTApplicationPersistenceService.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTApplicationPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTBusinessPersistenceService.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTBusinessPersistenceService.java
index 9cc575145..42bdc945f 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTBusinessPersistenceService.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTBusinessPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTCreditNotePersistenceService.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTCreditNotePersistenceService.java
index ffd626921..8f6db5a98 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTCreditNotePersistenceService.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTCreditNotePersistenceService.java
@@ -19,8 +19,8 @@
 package com.premiumminds.billy.portugal.services.persistence;
 
 import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTCustomerPersistenceService.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTCustomerPersistenceService.java
index e48660cd0..13f74e021 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTCustomerPersistenceService.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTCustomerPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTInvoicePersistenceService.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTInvoicePersistenceService.java
index dac757740..1c9f5c428 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTInvoicePersistenceService.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTInvoicePersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTProductPersistenceService.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTProductPersistenceService.java
index 8a691071e..b4500efe9 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTProductPersistenceService.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTProductPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTReceiptInvoicePersistenceService.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTReceiptInvoicePersistenceService.java
index da746471e..c8dd87c51 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTReceiptInvoicePersistenceService.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTReceiptInvoicePersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTRegionContextPersistenceService.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTRegionContextPersistenceService.java
index 2dcdd782e..5c820daf9 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTRegionContextPersistenceService.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTRegionContextPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTSimpleInvoicePersistenceService.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTSimpleInvoicePersistenceService.java
index 20354f287..9abc69024 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTSimpleInvoicePersistenceService.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTSimpleInvoicePersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTSupplierPersistenceService.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTSupplierPersistenceService.java
index 44b00cbc4..ce486b7bf 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTSupplierPersistenceService.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTSupplierPersistenceService.java
@@ -27,7 +27,7 @@
 import com.premiumminds.billy.portugal.persistence.dao.DAOPTSupplier;
 import com.premiumminds.billy.portugal.persistence.entities.PTSupplierEntity;
 import com.premiumminds.billy.portugal.services.entities.PTSupplier;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class PTSupplierPersistenceService implements PersistenceService<Supplier, PTSupplier> {
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTTaxPersistenceService.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTTaxPersistenceService.java
index df892b20d..3519adfc1 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTTaxPersistenceService.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/persistence/PTTaxPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.portugal.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/series/webservice/AuthenticationHandler.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/series/webservice/AuthenticationHandler.java
index afc3de50d..32fb7f3b8 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/series/webservice/AuthenticationHandler.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/series/webservice/AuthenticationHandler.java
@@ -40,14 +40,14 @@
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.SecretKeySpec;
 import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
+import jakarta.xml.soap.SOAPElement;
+import jakarta.xml.soap.SOAPEnvelope;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPFactory;
+import jakarta.xml.soap.SOAPHeader;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
 
 class AuthenticationHandler implements SOAPHandler<SOAPMessageContext>  {
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/series/webservice/Client.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/series/webservice/Client.java
index 48aa3b29d..da5ed00d1 100644
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/series/webservice/Client.java
+++ b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/services/series/webservice/Client.java
@@ -42,8 +42,8 @@
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.handler.Handler;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.handler.Handler;
 
 public class Client {
 
diff --git a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/util/SchemaExport.java b/billy-portugal/src/main/java/com/premiumminds/billy/portugal/util/SchemaExport.java
deleted file mode 100644
index ea5aaf7d0..000000000
--- a/billy-portugal/src/main/java/com/premiumminds/billy/portugal/util/SchemaExport.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2017 Premium Minds.
- *
- * This file is part of billy portugal (PT Pack).
- *
- * billy portugal (PT Pack) is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * billy portugal (PT Pack) is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with billy portugal (PT Pack). If not, see <http://www.gnu.org/licenses/>.
- */
-package com.premiumminds.billy.portugal.util;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
-import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
-import org.hibernate.jpa.boot.internal.PersistenceXmlParser;
-import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
-import org.hibernate.jpa.boot.spi.ProviderChecker;
-import org.hibernate.tool.schema.TargetType;
-
-public class SchemaExport {
-
-    public static void main(String[] args) {
-        SchemaExport
-            .exportSchema(args[0], args[1], args[2], args[3], args[4], args[5]);
-    }
-
-    private static void exportSchema(String persistenceUnit, String url, String username, String password,
-        String outputDir, String delimiter) {
-
-        File file = new File(outputDir);
-        new File(file.getParent()).mkdirs();
-
-        Map<String, Object>  properties = setupProperties(url, username, password);
-        EntityManagerFactoryBuilderImpl entityManagerFactoryBuilder =
-            getEntityManagerFactoryBuilderOrNull(persistenceUnit, properties);
-
-        EntityManagerFactory factory = entityManagerFactoryBuilder.build();
-        MetadataImplementor metaData = entityManagerFactoryBuilder.getMetadata();
-
-        org.hibernate.tool.hbm2ddl.SchemaExport se = new org.hibernate.tool.hbm2ddl.SchemaExport();
-        se.setOutputFile(outputDir);
-        se.setFormat(true);
-        se.setDelimiter(delimiter);
-        se.execute(EnumSet.of(TargetType.SCRIPT), org.hibernate.tool.hbm2ddl.SchemaExport.Action.CREATE, metaData);
-
-        factory.close();
-    }
-
-    private static Map<String, Object> setupProperties(String url, String username, String password) {
-        Map<String, Object>  properties = new HashMap<>();
-        properties.put("javax.persistence.jdbc.url", url);
-        properties.put("javax.persistence.jdbc.user", username);
-        properties.put("javax.persistence.jdbc.password", password);
-
-        return Collections.unmodifiableMap(properties);
-    }
-
-    private static EntityManagerFactoryBuilderImpl getEntityManagerFactoryBuilderOrNull(String persistenceUnitName,
-        Map<String, Object> properties) {
-
-        final List<ParsedPersistenceXmlDescriptor> units;
-        try {
-            units = PersistenceXmlParser.locatePersistenceUnits(properties);
-        } catch (Exception e) {
-            throw new PersistenceException("Unable to locate persistence units", e);
-        }
-
-        if (persistenceUnitName == null && units.size() > 1) {
-            throw new PersistenceException("No name provided and multiple persistence units found");
-        }
-
-        for (ParsedPersistenceXmlDescriptor persistenceUnit : units) {
-            final boolean matches = persistenceUnitName == null || persistenceUnit.getName().equals(persistenceUnitName);
-            if (!matches) {
-                continue;
-            }
-
-            if (!ProviderChecker.isProvider(persistenceUnit, properties)) {
-                continue;
-            }
-
-            return getEntityManagerFactoryBuilder(persistenceUnit, properties, null);
-        }
-
-        return null;
-    }
-
-    private static EntityManagerFactoryBuilderImpl getEntityManagerFactoryBuilder(
-        PersistenceUnitDescriptor persistenceUnitDescriptor, Map<String, Object> integration,
-        ClassLoader providedClassLoader) {
-
-        return new EntityManagerFactoryBuilderImpl(persistenceUnitDescriptor, integration, providedClassLoader);
-    }
-
-}
diff --git a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/export/webservice/ClientTest.java b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/export/webservice/ClientTest.java
index 9dbee0c05..50fae0005 100644
--- a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/export/webservice/ClientTest.java
+++ b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/export/webservice/ClientTest.java
@@ -38,7 +38,7 @@
 import java.util.stream.Stream;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/export/webservice/StubFatcorewsPort.java b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/export/webservice/StubFatcorewsPort.java
index d26aff846..8ed687f2a 100644
--- a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/export/webservice/StubFatcorewsPort.java
+++ b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/export/webservice/StubFatcorewsPort.java
@@ -19,12 +19,12 @@
 package com.premiumminds.billy.portugal.services.export.webservice;
 
 import java.util.function.Function;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
 
 import com.premiumminds.billy.portugal.webservices.documents.DeleteInvoiceRequest;
 import com.premiumminds.billy.portugal.webservices.documents.DeleteInvoiceResponse;
diff --git a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/series/webservice/ClientTest.java b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/series/webservice/ClientTest.java
index adf260b02..4e40d4e90 100644
--- a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/series/webservice/ClientTest.java
+++ b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/series/webservice/ClientTest.java
@@ -28,7 +28,7 @@
 import java.net.URL;
 import java.time.LocalDate;
 import java.util.Objects;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/series/webservice/StubSeriesWS.java b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/series/webservice/StubSeriesWS.java
index d4f932602..b4a4d20a0 100644
--- a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/series/webservice/StubSeriesWS.java
+++ b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/services/series/webservice/StubSeriesWS.java
@@ -23,15 +23,15 @@
 import com.premiumminds.billy.portugal.webservices.series.SeriesResp;
 import java.math.BigInteger;
 import java.util.function.Function;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.ws.Action;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.RequestWrapper;
+import jakarta.xml.ws.ResponseWrapper;
 
 @WebService(name = "SeriesWS", targetNamespace = "http://at.gov.pt/")
 @XmlSeeAlso({
diff --git a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/test/PortugalTestPersistenceDependencyModule.java b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/test/PortugalTestPersistenceDependencyModule.java
index 21d4a5d40..0e9caf5ac 100644
--- a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/test/PortugalTestPersistenceDependencyModule.java
+++ b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/test/PortugalTestPersistenceDependencyModule.java
@@ -22,12 +22,14 @@
 import com.google.inject.Inject;
 import com.google.inject.persist.PersistService;
 import com.google.inject.persist.jpa.JpaPersistModule;
+import com.google.inject.persist.jpa.JpaPersistOptions;
 
 public class PortugalTestPersistenceDependencyModule extends AbstractModule {
 
     @Override
     protected void configure() {
-        JpaPersistModule persistModule = new JpaPersistModule("BillyPortugalTestPersistenceUnit");
+        final var options = JpaPersistOptions.builder().setAutoBeginWorkOnEntityManagerCreation(true).build();
+        JpaPersistModule persistModule = new JpaPersistModule("BillyPortugalTestPersistenceUnit", options);
         this.install(persistModule);
     }
 
diff --git a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/test/util/PTBusinessTestUtil.java b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/test/util/PTBusinessTestUtil.java
index 82113dbf7..2bcbc136c 100644
--- a/billy-portugal/src/test/java/com/premiumminds/billy/portugal/test/util/PTBusinessTestUtil.java
+++ b/billy-portugal/src/test/java/com/premiumminds/billy/portugal/test/util/PTBusinessTestUtil.java
@@ -30,7 +30,7 @@
 import com.premiumminds.billy.portugal.services.entities.PTRegionContext;
 import com.premiumminds.billy.portugal.util.Contexts;
 
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import java.net.MalformedURLException;
 import java.time.ZoneId;
 import java.util.UUID;
diff --git a/billy-portugal/src/test/resources/META-INF/persistence.xml b/billy-portugal/src/test/resources/META-INF/persistence.xml
index 2e054cd49..2d037cfd4 100644
--- a/billy-portugal/src/test/resources/META-INF/persistence.xml
+++ b/billy-portugal/src/test/resources/META-INF/persistence.xml
@@ -41,14 +41,13 @@
 		<mapping-file>META-INF/orm-core.xml</mapping-file>
 		<mapping-file>META-INF/orm-portugal.xml</mapping-file>
 		<properties>
-			<property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-			<property name="javax.persistence.jdbc.url" value="jdbc:h2:/tmp/h2db" />
-			<property name="javax.persistence.jdbc.user" value="billytest" />
-			<property name="javax.persistence.jdbc.password" value="billytest" />
+			<property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver" />
+			<property name="jakarta.persistence.jdbc.url" value="jdbc:h2:/tmp/h2db" />
+			<property name="jakarta.persistence.jdbc.user" value="billytest" />
+			<property name="jakarta.persistence.jdbc.password" value="billytest" />
 
 			<property name="hibernate.show_sql" value="false" />
 			<property name="hibernate.hbm2ddl.auto" value="create" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
 			<property name="hibernate.globally_quoted_identifiers" value="true"/>
 		</properties>
 	</persistence-unit>
diff --git a/billy-spain/pom.xml b/billy-spain/pom.xml
index 4b487c62a..741b408ff 100644
--- a/billy-spain/pom.xml
+++ b/billy-spain/pom.xml
@@ -51,12 +51,12 @@
 
 		<!-- PERSISTENCE -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-envers</artifactId>
 		</dependency>
 
@@ -65,6 +65,7 @@
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-jpa</artifactId>
 			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
 			<scope>provided</scope>
 		</dependency>
 
@@ -170,6 +171,7 @@
 						<groupId>com.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
 						<version>${querydsl.version}</version>
+						<classifier>jakarta</classifier>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/BillySpain.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/BillySpain.java
index e24ca3211..9ea5c5ad6 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/BillySpain.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/BillySpain.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.spain;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/SpainPersistenceDependencyModule.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/SpainPersistenceDependencyModule.java
index 4dc79f413..ab9a7b75a 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/SpainPersistenceDependencyModule.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/SpainPersistenceDependencyModule.java
@@ -22,6 +22,7 @@
 import com.google.inject.Inject;
 import com.google.inject.persist.PersistService;
 import com.google.inject.persist.jpa.JpaPersistModule;
+import com.google.inject.persist.jpa.JpaPersistOptions;
 
 public class SpainPersistenceDependencyModule extends AbstractModule {
 
@@ -33,7 +34,8 @@ public SpainPersistenceDependencyModule(String persistenceUnitId) {
 
     @Override
     protected void configure() {
-        JpaPersistModule persistModule = new JpaPersistModule(this.persistenceUnitId);
+        final var options = JpaPersistOptions.builder().setAutoBeginWorkOnEntityManagerCreation(true).build();
+        JpaPersistModule persistModule = new JpaPersistModule(this.persistenceUnitId, options);
         this.install(persistModule);
     }
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/AbstractDAOESGenericInvoiceEntryImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/AbstractDAOESGenericInvoiceEntryImpl.java
index 8b3ed4cbe..326d4f98f 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/AbstractDAOESGenericInvoiceEntryImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/AbstractDAOESGenericInvoiceEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.AbstractDAOGenericInvoiceEntryImpl;
 import com.premiumminds.billy.spain.persistence.dao.AbstractDAOESGenericInvoiceEntry;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/AbstractDAOESGenericInvoiceImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/AbstractDAOESGenericInvoiceImpl.java
index f60f15b80..c53728279 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/AbstractDAOESGenericInvoiceImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/AbstractDAOESGenericInvoiceImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESAddressImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESAddressImpl.java
index 64852f5ac..d987b9242 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESAddressImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESAddressImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOAddressImpl;
 import com.premiumminds.billy.spain.persistence.dao.DAOESAddress;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESApplicationImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESApplicationImpl.java
index 27fc27963..3c48e951d 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESApplicationImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESApplicationImpl.java
@@ -18,10 +18,10 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Application;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESBusinessImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESBusinessImpl.java
index e80a21c63..3910bf871 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESBusinessImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESBusinessImpl.java
@@ -18,10 +18,10 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESContactImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESContactImpl.java
index 31734416b..909263a3f 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESContactImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESContactImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOContactImpl;
 import com.premiumminds.billy.spain.persistence.dao.DAOESContact;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditNoteEntryImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditNoteEntryImpl.java
index df48bc62d..59e941243 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditNoteEntryImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditNoteEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESCreditNoteEntry;
 import com.premiumminds.billy.spain.persistence.entities.ESCreditNoteEntity;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditNoteImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditNoteImpl.java
index 7c7ed50f2..9ec7899ca 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditNoteImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditNoteImpl.java
@@ -20,9 +20,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.core.services.StringID;
 import com.premiumminds.billy.core.services.entities.Business;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditReceiptEntryImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditReceiptEntryImpl.java
index bc6f8a254..f21bf45a9 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditReceiptEntryImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditReceiptEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESCreditReceiptEntry;
 import com.premiumminds.billy.spain.persistence.entities.ESCreditReceiptEntity;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditReceiptImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditReceiptImpl.java
index 4704fb54a..fcaccf5e4 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditReceiptImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCreditReceiptImpl.java
@@ -33,9 +33,9 @@
 import com.querydsl.jpa.JPQLQuery;
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 public class DAOESCreditReceiptImpl extends
         AbstractDAOESGenericInvoiceImpl<ESCreditReceiptEntity, JPAESCreditReceiptEntity> implements DAOESCreditReceipt {
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCustomerImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCustomerImpl.java
index 3df457410..79b5bf813 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCustomerImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESCustomerImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOCustomerImpl;
 import com.premiumminds.billy.spain.persistence.dao.DAOESCustomer;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESGenericInvoiceEntryImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESGenericInvoiceEntryImpl.java
index af01d49da..46789dbc2 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESGenericInvoiceEntryImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESGenericInvoiceEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESGenericInvoiceEntry;
 import com.premiumminds.billy.spain.persistence.entities.ESGenericInvoiceEntryEntity;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESGenericInvoiceImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESGenericInvoiceImpl.java
index ab9387b14..1f04dcad0 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESGenericInvoiceImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESGenericInvoiceImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESGenericInvoice;
 import com.premiumminds.billy.spain.persistence.entities.ESGenericInvoiceEntity;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESInvoiceEntryImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESInvoiceEntryImpl.java
index 5d0a37b42..5d2f38966 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESInvoiceEntryImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESInvoiceEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESInvoiceEntry;
 import com.premiumminds.billy.spain.persistence.entities.ESInvoiceEntryEntity;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESInvoiceImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESInvoiceImpl.java
index 2212c579a..37886e66d 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESInvoiceImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESInvoiceImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESInvoice;
 import com.premiumminds.billy.spain.persistence.entities.ESInvoiceEntity;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESPaymentImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESPaymentImpl.java
index 86ec4e883..a6fcadd2d 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESPaymentImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESPaymentImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOPaymentImpl;
 import com.premiumminds.billy.spain.persistence.dao.DAOESPayment;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESProductImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESProductImpl.java
index 79526b10e..e43de6c78 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESProductImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESProductImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOProductImpl;
 import com.premiumminds.billy.spain.persistence.dao.DAOESProduct;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESReceiptEntryImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESReceiptEntryImpl.java
index 628d497b9..a37ab35f6 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESReceiptEntryImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESReceiptEntryImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESReceiptEntry;
 import com.premiumminds.billy.spain.persistence.entities.ESReceiptEntryEntity;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESReceiptImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESReceiptImpl.java
index 32692817a..4d0ab9b86 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESReceiptImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESReceiptImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESReceipt;
 import com.premiumminds.billy.spain.persistence.entities.ESReceiptEntity;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESRegionContextImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESRegionContextImpl.java
index 765893746..5980688a3 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESRegionContextImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESRegionContextImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOContextImpl;
 import com.premiumminds.billy.spain.persistence.dao.DAOESRegionContext;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESShippingPointImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESShippingPointImpl.java
index 627d71f04..7db6066c9 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESShippingPointImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESShippingPointImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOShippingPointImpl;
 import com.premiumminds.billy.spain.persistence.dao.DAOESShippingPoint;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESSimpleInvoiceImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESSimpleInvoiceImpl.java
index 9248541ab..4abd7a3bb 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESSimpleInvoiceImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESSimpleInvoiceImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESSimpleInvoice;
 import com.premiumminds.billy.spain.persistence.entities.ESSimpleInvoiceEntity;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESSupplierImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESSupplierImpl.java
index ecfd02e7e..0539fee1d 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESSupplierImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESSupplierImpl.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.dao.jpa;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOSupplierImpl;
 import com.premiumminds.billy.spain.persistence.dao.DAOESSupplier;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESTaxImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESTaxImpl.java
index 9fbd1eb62..cd9f747ca 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESTaxImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/dao/jpa/DAOESTaxImpl.java
@@ -24,9 +24,9 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.persistence.EntityManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.persistence.EntityManager;
 
 import com.premiumminds.billy.persistence.dao.jpa.DAOTaxImpl;
 import com.premiumminds.billy.spain.persistence.dao.DAOESTax;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESAddressEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESAddressEntity.java
index cc320947f..e8d07b89c 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESAddressEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESAddressEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESApplicationEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESApplicationEntity.java
index b9af93ba8..3f7a14454 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESApplicationEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESApplicationEntity.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESBusinessEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESBusinessEntity.java
index ca8225cd4..9449760a3 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESBusinessEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESBusinessEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESContactEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESContactEntity.java
index 9a9f8352f..93e5b85b4 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESContactEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESContactEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditNoteEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditNoteEntity.java
index c84212ea9..430dc0ca0 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditNoteEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditNoteEntity.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditNoteEntryEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditNoteEntryEntity.java
index b20f61395..03cef91ab 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditNoteEntryEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditNoteEntryEntity.java
@@ -18,13 +18,13 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditReceiptEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditReceiptEntity.java
index ca23e43b9..f2127f191 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditReceiptEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditReceiptEntity.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditReceiptEntryEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditReceiptEntryEntity.java
index 2c10b4447..79a1bde42 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditReceiptEntryEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCreditReceiptEntryEntity.java
@@ -18,13 +18,13 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCustomerEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCustomerEntity.java
index 7ac7b1e8d..e70ccbbf3 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCustomerEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESCustomerEntity.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESGenericInvoiceEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESGenericInvoiceEntity.java
index 229ec3a97..ce0042590 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESGenericInvoiceEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESGenericInvoiceEntity.java
@@ -20,9 +20,9 @@
 
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESGenericInvoiceEntryEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESGenericInvoiceEntryEntity.java
index cadbc1480..0b6c18b37 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESGenericInvoiceEntryEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESGenericInvoiceEntryEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESInvoiceEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESInvoiceEntity.java
index 0cb089d6a..8e7c3fde0 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESInvoiceEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESInvoiceEntity.java
@@ -20,10 +20,10 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESInvoiceEntryEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESInvoiceEntryEntity.java
index 1a4d67879..2a1a059e5 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESInvoiceEntryEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESInvoiceEntryEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESPaymentEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESPaymentEntity.java
index 03c9272ee..dec9398c1 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESPaymentEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESPaymentEntity.java
@@ -20,9 +20,9 @@
 
 import java.math.BigDecimal;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESProductEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESProductEntity.java
index 1bacf57fe..0029987e8 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESProductEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESProductEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESReceiptEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESReceiptEntity.java
index b9aa44c62..3fe26dedf 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESReceiptEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESReceiptEntity.java
@@ -20,10 +20,10 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESReceiptEntryEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESReceiptEntryEntity.java
index 48ab9d393..a09f68e06 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESReceiptEntryEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESReceiptEntryEntity.java
@@ -18,10 +18,10 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESRegionContextEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESRegionContextEntity.java
index 94747d795..778610b7d 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESRegionContextEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESRegionContextEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESShippingPointEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESShippingPointEntity.java
index 5dab997db..3caedadc2 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESShippingPointEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESShippingPointEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESSimpleInvoiceEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESSimpleInvoiceEntity.java
index 7d46fc6c9..5f9249b8d 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESSimpleInvoiceEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESSimpleInvoiceEntity.java
@@ -20,9 +20,9 @@
 
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESSupplierEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESSupplierEntity.java
index 86cced2c8..9ea3562e0 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESSupplierEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESSupplierEntity.java
@@ -18,9 +18,9 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESTaxEntity.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESTaxEntity.java
index 4a9705eb0..ed47f71d6 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESTaxEntity.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/persistence/entities/jpa/JPAESTaxEntity.java
@@ -18,8 +18,8 @@
  */
 package com.premiumminds.billy.spain.persistence.entities.jpa;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESAddressBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESAddressBuilderImpl.java
index 943c1de97..102e901d5 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESAddressBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESAddressBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.AddressBuilderImpl;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESApplicationBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESApplicationBuilderImpl.java
index 8abc71d9d..6c2557d24 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESApplicationBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESApplicationBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ApplicationBuilderImpl;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESBusinessBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESBusinessBuilderImpl.java
index fd342f201..6d65b66f2 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESBusinessBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESBusinessBuilderImpl.java
@@ -32,7 +32,7 @@
 import com.premiumminds.billy.spain.services.entities.ESBusiness;
 import com.premiumminds.billy.spain.util.ESFinancialValidator;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESContactBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESContactBuilderImpl.java
index 9aa7655ad..3d703e421 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESContactBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESContactBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ContactBuilderImpl;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESCustomerBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESCustomerBuilderImpl.java
index 009984210..44a05502c 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESCustomerBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESCustomerBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.exceptions.InvalidTaxIdentificationNumberException;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESInvoiceEntryBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESInvoiceEntryBuilderImpl.java
index cbf4e0d0b..97183cba9 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESInvoiceEntryBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESInvoiceEntryBuilderImpl.java
@@ -30,7 +30,7 @@
 import com.premiumminds.billy.spain.persistence.entities.ESInvoiceEntryEntity;
 import com.premiumminds.billy.spain.services.builders.ESInvoiceEntryBuilder;
 import com.premiumminds.billy.spain.services.entities.ESInvoiceEntry;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class ESInvoiceEntryBuilderImpl<TBuilder extends ESInvoiceEntryBuilderImpl<TBuilder, TEntry>,
     TEntry extends ESInvoiceEntry>
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESPaymentBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESPaymentBuilderImpl.java
index a7a08827c..992e3a8e8 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESPaymentBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESPaymentBuilderImpl.java
@@ -21,7 +21,7 @@
 import java.math.BigDecimal;
 import java.util.Date;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.PaymentBuilderImpl;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESProductBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESProductBuilderImpl.java
index 8f1bcc9e3..b5bb7b513 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESProductBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESProductBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ProductBuilderImpl;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESRegionContextBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESRegionContextBuilderImpl.java
index cd0691bed..519c000e4 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESRegionContextBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESRegionContextBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.builders.impl.ContextBuilderImpl;
 import com.premiumminds.billy.core.util.Localizer;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESShippingPointBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESShippingPointBuilderImpl.java
index d1e2e6b78..45b5c7530 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESShippingPointBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESShippingPointBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.ShippingPointBuilderImpl;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESSupplierBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESSupplierBuilderImpl.java
index 5281b68a0..b3be4c0bc 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESSupplierBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESSupplierBuilderImpl.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.builders.impl;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.exceptions.InvalidTaxIdentificationNumberException;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESTaxBuilderImpl.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESTaxBuilderImpl.java
index 6164de738..5f6d598c0 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESTaxBuilderImpl.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/builders/impl/ESTaxBuilderImpl.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.spain.services.builders.impl;
 
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyValidationException;
 import com.premiumminds.billy.core.services.builders.impl.TaxBuilderImpl;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESCreditNoteIssuingHandler.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESCreditNoteIssuingHandler.java
index 311ab2c0e..c18fc248c 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESCreditNoteIssuingHandler.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESCreditNoteIssuingHandler.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.spain.services.documents;
 
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESCreditReceiptIssuingHandler.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESCreditReceiptIssuingHandler.java
index 18ea8b68b..4cf451fa5 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESCreditReceiptIssuingHandler.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESCreditReceiptIssuingHandler.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.spain.services.documents;
 
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESGenericInvoiceIssuingHandler.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESGenericInvoiceIssuingHandler.java
index b8ee83e56..e500c983e 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESGenericInvoiceIssuingHandler.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESGenericInvoiceIssuingHandler.java
@@ -31,8 +31,8 @@
 import java.time.ZoneId;
 import java.util.Date;
 import java.util.Optional;
-import javax.inject.Inject;
-import javax.persistence.LockModeType;
+import jakarta.inject.Inject;
+import jakarta.persistence.LockModeType;
 
 public abstract class ESGenericInvoiceIssuingHandler<T extends ESGenericInvoiceEntity, P extends ESIssuingParams>
         implements DocumentIssuingHandler<T, P> {
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESInvoiceIssuingHandler.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESInvoiceIssuingHandler.java
index a6b3c2ac5..c16a17bc7 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESInvoiceIssuingHandler.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESInvoiceIssuingHandler.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.spain.services.documents;
 
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESReceiptIssuingHandler.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESReceiptIssuingHandler.java
index deb0a95b7..061d8449c 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESReceiptIssuingHandler.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESReceiptIssuingHandler.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.spain.services.documents;
 
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESSimpleInvoiceIssuingHandler.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESSimpleInvoiceIssuingHandler.java
index 2711e815a..07797bc7a 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESSimpleInvoiceIssuingHandler.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/documents/ESSimpleInvoiceIssuingHandler.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.spain.services.documents;
 
 import com.premiumminds.billy.core.services.exceptions.DocumentSeriesDoesNotExistException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.persistence.dao.DAOInvoiceSeries;
 import com.premiumminds.billy.core.services.exceptions.DocumentIssuingException;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESAddress.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESAddress.java
index 7dd7a40b7..7d4b67e5b 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESAddress.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESAddress.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Address;
 import com.premiumminds.billy.spain.persistence.dao.DAOESAddress;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESApplication.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESApplication.java
index 03c28c45f..fa6e40c4b 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESApplication.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESApplication.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Application;
 import com.premiumminds.billy.spain.persistence.dao.DAOESApplication;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESBusiness.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESBusiness.java
index dd86de2df..4cc2819dc 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESBusiness.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESBusiness.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Business;
 import com.premiumminds.billy.spain.persistence.dao.DAOESBusiness;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESContact.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESContact.java
index 0b43b1bb8..c65bbac32 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESContact.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESContact.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Contact;
 import com.premiumminds.billy.spain.persistence.dao.DAOESContact;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditNote.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditNote.java
index bf0f1f0ed..b2e6efcd8 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditNote.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditNote.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESBusiness;
 import com.premiumminds.billy.spain.persistence.dao.DAOESCreditNote;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditNoteEntry.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditNoteEntry.java
index 255136ffd..f3265a95f 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditNoteEntry.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditNoteEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESCreditNoteEntry;
 import com.premiumminds.billy.spain.persistence.dao.DAOESInvoice;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditReceipt.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditReceipt.java
index 549d86b2d..aaae38283 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditReceipt.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditReceipt.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESBusiness;
 import com.premiumminds.billy.spain.persistence.dao.DAOESCreditReceipt;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditReceiptEntry.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditReceiptEntry.java
index ee9b76278..227b5a5a1 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditReceiptEntry.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCreditReceiptEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESCreditReceiptEntry;
 import com.premiumminds.billy.spain.persistence.dao.DAOESProduct;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCustomer.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCustomer.java
index e365f6221..f5be813bc 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCustomer.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESCustomer.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Customer;
 import com.premiumminds.billy.spain.persistence.dao.DAOESContact;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESGenericInvoice.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESGenericInvoice.java
index fcdc88d8d..99f1b4381 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESGenericInvoice.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESGenericInvoice.java
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESGenericInvoiceEntry.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESGenericInvoiceEntry.java
index 38c86e891..e8bb927f8 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESGenericInvoiceEntry.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESGenericInvoiceEntry.java
@@ -19,7 +19,7 @@
 package com.premiumminds.billy.spain.services.entities;
 
 import com.premiumminds.billy.spain.persistence.entities.ESGenericInvoiceEntity;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
 import com.premiumminds.billy.spain.persistence.dao.DAOESGenericInvoice;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESInvoice.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESInvoice.java
index f33b6ba89..5fae2b40c 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESInvoice.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESInvoice.java
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESInvoiceEntry.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESInvoiceEntry.java
index dab4b989a..a048b79e7 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESInvoiceEntry.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESInvoiceEntry.java
@@ -25,7 +25,7 @@
 import com.premiumminds.billy.spain.persistence.dao.DAOESTax;
 import com.premiumminds.billy.spain.services.builders.impl.ESInvoiceEntryBuilderImpl;
 import com.premiumminds.billy.spain.services.builders.impl.ESManualInvoiceEntryBuilderImpl;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public interface ESInvoiceEntry extends ESGenericInvoiceEntry {
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESPayment.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESPayment.java
index a14c3b79c..8ecc9b0b1 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESPayment.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESPayment.java
@@ -20,7 +20,7 @@
 
 import java.math.BigDecimal;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.util.PaymentMechanism;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESProduct.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESProduct.java
index b437caf1f..7ca36d446 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESProduct.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESProduct.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Product;
 import com.premiumminds.billy.spain.persistence.dao.DAOESProduct;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESReceipt.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESReceipt.java
index 187ad13c1..8a325e4cd 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESReceipt.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESReceipt.java
@@ -20,7 +20,7 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Payment;
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoiceEntry;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESReceiptEntry.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESReceiptEntry.java
index dd475f137..711c95fe4 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESReceiptEntry.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESReceiptEntry.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESProduct;
 import com.premiumminds.billy.spain.persistence.dao.DAOESReceipt;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESRegionContext.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESRegionContext.java
index 88466a1ae..81d884fa8 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESRegionContext.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESRegionContext.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Context;
 import com.premiumminds.billy.spain.persistence.dao.DAOESRegionContext;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESShippingPoint.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESShippingPoint.java
index a57116bf7..25a24e18a 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESShippingPoint.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESShippingPoint.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.ShippingPoint;
 import com.premiumminds.billy.spain.persistence.dao.DAOESShippingPoint;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESSimpleInvoice.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESSimpleInvoice.java
index d667d8d1c..ecfaafbff 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESSimpleInvoice.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESSimpleInvoice.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.spain.persistence.dao.DAOESBusiness;
 import com.premiumminds.billy.spain.persistence.dao.DAOESCustomer;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESSupplier.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESSupplier.java
index 0dc859f2b..911b14740 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESSupplier.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESSupplier.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Supplier;
 import com.premiumminds.billy.spain.persistence.dao.DAOESSupplier;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESTax.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESTax.java
index 65d89d222..bd6562095 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESTax.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/entities/ESTax.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.entities;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.services.entities.Tax;
 import com.premiumminds.billy.spain.persistence.dao.DAOESRegionContext;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESCreditNoteDataExtractor.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESCreditNoteDataExtractor.java
index 262e1c23e..c97c1d804 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESCreditNoteDataExtractor.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESCreditNoteDataExtractor.java
@@ -24,7 +24,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.gin.services.exceptions.ExportServiceException;
 import com.premiumminds.billy.gin.services.export.BillyDataExtractor;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESCreditReceiptDataExtractor.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESCreditReceiptDataExtractor.java
index 2ad9582bc..e98dd8c24 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESCreditReceiptDataExtractor.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESCreditReceiptDataExtractor.java
@@ -24,7 +24,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.gin.services.exceptions.ExportServiceException;
 import com.premiumminds.billy.gin.services.export.BillyDataExtractor;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESInvoiceDataExtractor.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESInvoiceDataExtractor.java
index bdf30538b..1920b050c 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESInvoiceDataExtractor.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESInvoiceDataExtractor.java
@@ -22,7 +22,7 @@
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.gin.services.exceptions.ExportServiceException;
 import com.premiumminds.billy.gin.services.export.BillyDataExtractor;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESReceiptDataExtractor.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESReceiptDataExtractor.java
index 1e1fdf64d..316747cac 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESReceiptDataExtractor.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESReceiptDataExtractor.java
@@ -22,7 +22,7 @@
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.gin.services.exceptions.ExportServiceException;
 import com.premiumminds.billy.gin.services.export.BillyDataExtractor;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESSimpleInvoiceDataExtractor.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESSimpleInvoiceDataExtractor.java
index 5d68c6ea4..b26fc09ed 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESSimpleInvoiceDataExtractor.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/export/ESSimpleInvoiceDataExtractor.java
@@ -22,7 +22,7 @@
 import com.premiumminds.billy.core.services.entities.documents.GenericInvoice;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.gin.services.exceptions.ExportServiceException;
 import com.premiumminds.billy.gin.services.export.BillyDataExtractor;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESApplicationPersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESApplicationPersistenceService.java
index 9e1659b6e..b52c753ff 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESApplicationPersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESApplicationPersistenceService.java
@@ -27,7 +27,7 @@
 import com.premiumminds.billy.spain.persistence.dao.DAOESApplication;
 import com.premiumminds.billy.spain.persistence.entities.ESApplicationEntity;
 import com.premiumminds.billy.spain.services.entities.ESApplication;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class ESApplicationPersistenceService implements PersistenceService<Application, ESApplication> {
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESBusinessPersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESBusinessPersistenceService.java
index 5a960c0af..a0d7d602d 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESBusinessPersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESBusinessPersistenceService.java
@@ -27,7 +27,7 @@
 import com.premiumminds.billy.spain.persistence.dao.DAOESBusiness;
 import com.premiumminds.billy.spain.persistence.entities.ESBusinessEntity;
 import com.premiumminds.billy.spain.services.entities.ESBusiness;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class ESBusinessPersistenceService implements PersistenceService<Business, ESBusiness> {
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCreditNotePersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCreditNotePersistenceService.java
index 693c4b81c..569db4afc 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCreditNotePersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCreditNotePersistenceService.java
@@ -19,8 +19,8 @@
 package com.premiumminds.billy.spain.services.persistence;
 
 import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCreditReceiptPersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCreditReceiptPersistenceService.java
index 09c8c3d42..63782b26f 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCreditReceiptPersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCreditReceiptPersistenceService.java
@@ -19,8 +19,8 @@
 package com.premiumminds.billy.spain.services.persistence;
 
 import java.util.List;
-import javax.inject.Inject;
-import javax.persistence.NoResultException;
+import jakarta.inject.Inject;
+import jakarta.persistence.NoResultException;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCustomerPersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCustomerPersistenceService.java
index 56dc544ff..5379d347b 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCustomerPersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESCustomerPersistenceService.java
@@ -27,7 +27,7 @@
 import com.premiumminds.billy.spain.persistence.dao.DAOESCustomer;
 import com.premiumminds.billy.spain.persistence.entities.ESCustomerEntity;
 import com.premiumminds.billy.spain.services.entities.ESCustomer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class ESCustomerPersistenceService implements PersistenceService<Customer, ESCustomer> {
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESInvoicePersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESInvoicePersistenceService.java
index dc7cd7eaa..c2d415fc3 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESInvoicePersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESInvoicePersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESProductPersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESProductPersistenceService.java
index d99267fbd..bd7f3b67a 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESProductPersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESProductPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESReceiptPersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESReceiptPersistenceService.java
index 08a445a0d..3ea53a142 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESReceiptPersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESReceiptPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESRegionContextPersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESRegionContextPersistenceService.java
index b8da43317..af412ce9b 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESRegionContextPersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESRegionContextPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESSimpleInvoicePersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESSimpleInvoicePersistenceService.java
index 4d68e9d22..70eeabcb6 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESSimpleInvoicePersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESSimpleInvoicePersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESSupplierPersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESSupplierPersistenceService.java
index 3ad5536a1..95f226cae 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESSupplierPersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESSupplierPersistenceService.java
@@ -27,7 +27,7 @@
 import com.premiumminds.billy.spain.persistence.dao.DAOESSupplier;
 import com.premiumminds.billy.spain.persistence.entities.ESSupplierEntity;
 import com.premiumminds.billy.spain.services.entities.ESSupplier;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class ESSupplierPersistenceService implements PersistenceService<Supplier, ESSupplier> {
 
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESTaxPersistenceService.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESTaxPersistenceService.java
index c07140d32..cb059dad0 100644
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESTaxPersistenceService.java
+++ b/billy-spain/src/main/java/com/premiumminds/billy/spain/services/persistence/ESTaxPersistenceService.java
@@ -18,7 +18,7 @@
  */
 package com.premiumminds.billy.spain.services.persistence;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.premiumminds.billy.core.exceptions.BillyRuntimeException;
 import com.premiumminds.billy.core.persistence.dao.TransactionWrapper;
diff --git a/billy-spain/src/main/java/com/premiumminds/billy/spain/util/SchemaExport.java b/billy-spain/src/main/java/com/premiumminds/billy/spain/util/SchemaExport.java
deleted file mode 100644
index f9801a8ef..000000000
--- a/billy-spain/src/main/java/com/premiumminds/billy/spain/util/SchemaExport.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2017 Premium Minds.
- *
- * This file is part of billy spain (ES Pack).
- *
- * billy spain (ES Pack) is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * billy spain (ES Pack) is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with billy spain (ES Pack). If not, see <http://www.gnu.org/licenses/>.
- */
-package com.premiumminds.billy.spain.util;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
-import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
-import org.hibernate.jpa.boot.internal.PersistenceXmlParser;
-import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
-import org.hibernate.jpa.boot.spi.ProviderChecker;
-import org.hibernate.tool.schema.TargetType;
-
-public class SchemaExport {
-
-    public static void main(String[] args) {
-        SchemaExport
-            .exportSchema(args[0], args[1], args[2], args[3], args[4], args[5]);
-    }
-
-    private static void exportSchema(String persistenceUnit, String url, String username, String password,
-        String outputDir, String delimiter) {
-
-        File file = new File(outputDir);
-        new File(file.getParent()).mkdirs();
-
-        Map<String, Object> properties = setupProperties(url, username, password);
-        EntityManagerFactoryBuilderImpl entityManagerFactoryBuilder =
-            getEntityManagerFactoryBuilderOrNull(persistenceUnit, properties);
-
-        EntityManagerFactory factory = entityManagerFactoryBuilder.build();
-        MetadataImplementor metaData = entityManagerFactoryBuilder.getMetadata();
-
-        org.hibernate.tool.hbm2ddl.SchemaExport se = new org.hibernate.tool.hbm2ddl.SchemaExport();
-        se.setOutputFile(outputDir);
-        se.setFormat(true);
-        se.setDelimiter(delimiter);
-        se.execute(EnumSet.of(TargetType.SCRIPT), org.hibernate.tool.hbm2ddl.SchemaExport.Action.CREATE, metaData);
-
-        factory.close();
-    }
-
-    private static Map<String, Object> setupProperties(String url, String username, String password) {
-        Map<String, Object>  properties = new HashMap<>();
-        properties.put("javax.persistence.jdbc.url", url);
-        properties.put("javax.persistence.jdbc.user", username);
-        properties.put("javax.persistence.jdbc.password", password);
-
-        return Collections.unmodifiableMap(properties);
-    }
-
-    private static EntityManagerFactoryBuilderImpl getEntityManagerFactoryBuilderOrNull(String persistenceUnitName,
-        Map<String, Object> properties) {
-
-        final List<ParsedPersistenceXmlDescriptor> units;
-        try {
-            units = PersistenceXmlParser.locatePersistenceUnits(properties);
-        } catch (Exception e) {
-            throw new PersistenceException("Unable to locate persistence units", e);
-        }
-
-        if (persistenceUnitName == null && units.size() > 1) {
-            throw new PersistenceException("No name provided and multiple persistence units found");
-        }
-
-        for (ParsedPersistenceXmlDescriptor persistenceUnit : units) {
-            final boolean matches = persistenceUnitName == null || persistenceUnit.getName().equals(persistenceUnitName);
-            if (!matches) {
-                continue;
-            }
-
-            if (!ProviderChecker.isProvider(persistenceUnit, properties)) {
-                continue;
-            }
-
-            return getEntityManagerFactoryBuilder(persistenceUnit, properties, null);
-        }
-
-        return null;
-    }
-
-    private static EntityManagerFactoryBuilderImpl getEntityManagerFactoryBuilder(
-        PersistenceUnitDescriptor persistenceUnitDescriptor, Map<String, Object> integration,
-        ClassLoader providedClassLoader) {
-
-        return new EntityManagerFactoryBuilderImpl(persistenceUnitDescriptor, integration, providedClassLoader);
-    }
-}
diff --git a/billy-spain/src/test/java/com/premiumminds/billy/spain/test/SpainTestPersistenceDependencyModule.java b/billy-spain/src/test/java/com/premiumminds/billy/spain/test/SpainTestPersistenceDependencyModule.java
index 71e744d95..90a40c517 100644
--- a/billy-spain/src/test/java/com/premiumminds/billy/spain/test/SpainTestPersistenceDependencyModule.java
+++ b/billy-spain/src/test/java/com/premiumminds/billy/spain/test/SpainTestPersistenceDependencyModule.java
@@ -22,12 +22,14 @@
 import com.google.inject.Inject;
 import com.google.inject.persist.PersistService;
 import com.google.inject.persist.jpa.JpaPersistModule;
+import com.google.inject.persist.jpa.JpaPersistOptions;
 
 public class SpainTestPersistenceDependencyModule extends AbstractModule {
 
     @Override
     protected void configure() {
-        JpaPersistModule persistModule = new JpaPersistModule("BillySpainTestPersistenceUnit");
+        final var options = JpaPersistOptions.builder().setAutoBeginWorkOnEntityManagerCreation(true).build();
+        JpaPersistModule persistModule = new JpaPersistModule("BillySpainTestPersistenceUnit", options);
         this.install(persistModule);
     }
 
diff --git a/billy-spain/src/test/java/com/premiumminds/billy/spain/test/services/dao/TestDAOESInvoice.java b/billy-spain/src/test/java/com/premiumminds/billy/spain/test/services/dao/TestDAOESInvoice.java
index d85ef2850..35de9567a 100644
--- a/billy-spain/src/test/java/com/premiumminds/billy/spain/test/services/dao/TestDAOESInvoice.java
+++ b/billy-spain/src/test/java/com/premiumminds/billy/spain/test/services/dao/TestDAOESInvoice.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.UUID;
 
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/billy-spain/src/test/java/com/premiumminds/billy/spain/test/util/ESBusinessTestUtil.java b/billy-spain/src/test/java/com/premiumminds/billy/spain/test/util/ESBusinessTestUtil.java
index 0d455d49c..a23cac0dc 100644
--- a/billy-spain/src/test/java/com/premiumminds/billy/spain/test/util/ESBusinessTestUtil.java
+++ b/billy-spain/src/test/java/com/premiumminds/billy/spain/test/util/ESBusinessTestUtil.java
@@ -30,7 +30,7 @@
 import com.premiumminds.billy.spain.services.entities.ESRegionContext;
 import com.premiumminds.billy.spain.util.Contexts;
 
-import javax.persistence.NoResultException;
+import jakarta.persistence.NoResultException;
 import java.net.MalformedURLException;
 import java.time.ZoneId;
 import java.util.UUID;
diff --git a/billy-spain/src/test/resources/META-INF/persistence.xml b/billy-spain/src/test/resources/META-INF/persistence.xml
index 0edb6de1c..1f5d31759 100644
--- a/billy-spain/src/test/resources/META-INF/persistence.xml
+++ b/billy-spain/src/test/resources/META-INF/persistence.xml
@@ -41,14 +41,13 @@
 		<mapping-file>META-INF/orm-core.xml</mapping-file>
 		<mapping-file>META-INF/orm-spain.xml</mapping-file>
 		<properties>
-			<property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-			<property name="javax.persistence.jdbc.url" value="jdbc:h2:/tmp/h2db" />
-			<property name="javax.persistence.jdbc.user" value="billytest" />
-			<property name="javax.persistence.jdbc.password" value="billytest" />
+			<property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver" />
+			<property name="jakarta.persistence.jdbc.url" value="jdbc:h2:/tmp/h2db" />
+			<property name="jakarta.persistence.jdbc.user" value="billytest" />
+			<property name="jakarta.persistence.jdbc.password" value="billytest" />
 
 			<property name="hibernate.show_sql" value="false" />
 			<property name="hibernate.hbm2ddl.auto" value="create" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
 			<property name="hibernate.globally_quoted_identifiers" value="true"/>
 		</properties>
 	</persistence-unit>
diff --git a/pom.xml b/pom.xml
index ad814b5b5..8dda2d39f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,9 +23,9 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<main.dir>${basedir}</main.dir>
 		<java.version>11</java.version>
-		<guice.version>5.1.0</guice.version>
+		<guice.version>7.0.0</guice.version>
 		<querydsl.version>5.0.0</querydsl.version>
-		<hibernate.version>5.6.15.Final</hibernate.version>
+		<hibernate.version>6.3.1.Final</hibernate.version>
 	</properties>
 
 	<modules>
@@ -71,14 +71,14 @@
 
 			<!-- PERSISTENCE -->
 			<dependency>
-				<groupId>org.hibernate</groupId>
+				<groupId>org.hibernate.orm</groupId>
 				<artifactId>hibernate-core</artifactId>
 				<version>${hibernate.version}</version>
 				<scope>provided</scope>
 			</dependency>
 
 			<dependency>
-				<groupId>org.hibernate</groupId>
+				<groupId>org.hibernate.orm</groupId>
 				<artifactId>hibernate-envers</artifactId>
 				<version>${hibernate.version}</version>
 				<scope>provided</scope>
@@ -154,6 +154,43 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.4.1</version>
+				<executions>
+					<execution>
+						<id>enforce-banned-dependencies</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<bannedDependencies>
+									<excludes>
+										<exclude>javax*</exclude>
+										<exclude>jakarta.inject:jakarta.inject-api:(,2)</exclude>
+										<exclude>jakarta.activation:jakarta.activation-api:(,2)</exclude>
+										<exclude>jakarta.annotation:jakarta.annotation-api:(,2)</exclude>
+										<exclude>jakarta.el:jakarta.el-api:(,4)</exclude>
+										<exclude>jakarta.json:jakarta.json-api:(,2)</exclude>
+										<exclude>jakarta.jws:jakarta.jws-api:(,3)</exclude>
+										<exclude>jakarta.persistence:jakarta.persistence-api:(,3)</exclude>
+										<exclude>jakarta.servlet:jakarta.servlet-api:(,5)</exclude>
+										<exclude>jakarta.xml.bind:jakarta.xml.bind-api:(,3)</exclude>
+										<exclude>jakarta.xml.soap:jakarta.xml.soap-api:(,2)</exclude>
+										<exclude>jakarta.xml.ws:jakarta.xml.ws-api:(,3]</exclude>
+										<exclude>jakarta.validation:jakarta.validation-api:(,3)</exclude>
+										<exclude>org.hibernate.javax.persistence:hibernate-jpa-2.1-api</exclude>
+										<exclude>org.hibernate:hibernate-core</exclude>
+									</excludes>
+								</bannedDependencies>
+							</rules>
+							<fail>true</fail>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<inherited>true</inherited>
 				<groupId>com.mycila</groupId>
@@ -294,9 +331,9 @@
 		<pluginManagement>
 			<plugins>
 				<plugin>
-					<groupId>org.jvnet.jaxb2.maven2</groupId>
-					<artifactId>maven-jaxb2-plugin</artifactId>
-					<version>0.15.3</version>
+					<groupId>org.jvnet.jaxb</groupId>
+					<artifactId>jaxb-maven-plugin</artifactId>
+					<version>3.0.1</version>
 				</plugin>
 				<plugin>
 					<groupId>com.mysema.maven</groupId>