diff --git a/pom.xml b/pom.xml
index 41410f09..92c0a972 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.18</version>
+		<version>3.3.1</version>
 		<relativePath />
 	</parent>
 
@@ -35,13 +35,11 @@
 	<properties>
 		<apt-maven.version>1.1.3</apt-maven.version>
 		<docx4j.version>11.4.6</docx4j.version>
-		<firebase.version>8.1.0</firebase.version>
-		<graphql-starter.version>0.0.7</graphql-starter.version>
+		<firebase.version>9.2.0</firebase.version>
+		<graphql-starter.version>1.0.1</graphql-starter.version>
 		<google-search.version>v1-rev20230701-2.0.0</google-search.version>
 		<imgscalr.version>4.2</imgscalr.version>
 		<jacoco.version>0.8.7</jacoco.version>
-		<jakarta.activation>2.1.0</jakarta.activation>
-		<jakarta.xml>4.0.0</jakarta.xml>
 		<java.version>17</java.version>
 		<javassist.version>3.29.2-GA</javassist.version>
 		<jsoup.version>1.15.4</jsoup.version>
@@ -49,7 +47,8 @@
 		<openhtmltopdf.version>1.0.10</openhtmltopdf.version>
 		<reflection.version>0.10.2</reflection.version>
 		<slugify.version>3.0.4</slugify.version>
-		<twelvemonkeys.imageio>3.5</twelvemonkeys.imageio>
+		<twelvemonkeys.imageio>3.10.1</twelvemonkeys.imageio>
+		<querydsl.version>5.1.0</querydsl.version>
 	</properties>
 
 	<dependencies>
@@ -99,15 +98,19 @@
 			<artifactId>openhtmltopdf-pdfbox</artifactId>
 			<version>${openhtmltopdf.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.querydsl</groupId>
-			<artifactId>querydsl-apt</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.querydsl</groupId>
-			<artifactId>querydsl-jpa</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-apt</artifactId>
+            <version>${querydsl.version}</version>
+            <classifier>jakarta</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.querydsl</groupId>
+            <artifactId>querydsl-jpa</artifactId>
+            <version>${querydsl.version}</version>
+            <classifier>jakarta</classifier>
+        </dependency>
 		<dependency>
 			<groupId>com.twelvemonkeys.imageio</groupId>
 			<artifactId>imageio-core</artifactId>
@@ -127,6 +130,7 @@
 			<groupId>com.twelvemonkeys.servlet</groupId>
 			<artifactId>servlet</artifactId>
 			<version>${twelvemonkeys.imageio}</version>
+			<classifier>jakarta</classifier>			
 		</dependency>
 		<dependency>
 			<groupId>io.leangen.graphql</groupId>
@@ -156,7 +160,7 @@
 			<groupId>org.liquibase</groupId>
 			<artifactId>liquibase-core</artifactId>
 		</dependency>
-		<!-- <dependency>
+<!--	    <dependency>
 			<groupId>org.postgresql</groupId>
 		<artifactId>postgresql</artifactId>
 			<scope>runtime</scope>
@@ -234,22 +238,19 @@
 			It will throw
 		an error because of different XML bind usages.
 			See:
-		https://stackoverflow.com/questions/52502189/java-11-package-javax-xml-bind-does-not-exist
+		https://stackoverflow.com/questions/52502189/java-11-package-jakarta-xml-bind-does-not-exist
 		-->
 		<dependency>
 			<groupId>jakarta.activation</groupId>
 			<artifactId>jakarta.activation-api</artifactId>
-			<version>${jakarta.activation}</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>${jakarta.xml}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.xml.bind</groupId>
 			<artifactId>jaxb-impl</artifactId>
-			<version>${jakarta.xml}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -327,7 +328,7 @@
 						<version>2.6.0</version>
 					</dependency>
 					<dependency>
-						<groupId>javax.validation</groupId>
+						<groupId>jakarta.validation</groupId>
 						<artifactId>validation-api</artifactId>
 						<version>2.0.1.Final</version>
 					</dependency>
diff --git a/src/main/java/app/milo/server/App.java b/src/main/java/app/milo/server/App.java
index 275a364a..be77dcaa 100644
--- a/src/main/java/app/milo/server/App.java
+++ b/src/main/java/app/milo/server/App.java
@@ -2,12 +2,8 @@
 
 import java.io.IOException;
 import java.time.OffsetDateTime;
-import java.util.List;
 import java.util.Optional;
 import java.util.TimeZone;
-
-import javax.annotation.PostConstruct;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -22,18 +18,19 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
-import app.milo.server.core.error.ExceptionResolverInterceptor;
+import app.milo.server.core.error.CustomExceptionHandler;
 import app.milo.server.core.error.errorMessage.ErrorMessageService;
 import app.milo.server.core.i18n.TranslationPreprocessor;
 import app.milo.server.core.repository.CustomRepositoryFactoryBean;
-import io.leangen.graphql.ExtensionProvider;
-import io.leangen.graphql.GeneratorConfiguration;
-import io.leangen.graphql.execution.ResolverInterceptorFactory;
+import graphql.GraphQL;
+import graphql.execution.AsyncExecutionStrategy;
+import graphql.execution.AsyncSerialExecutionStrategy;
+import graphql.schema.GraphQLSchema;
 import io.leangen.graphql.metadata.strategy.value.ValueMapperFactory;
 import io.leangen.graphql.metadata.strategy.value.jackson.JacksonValueMapper;
 import io.leangen.graphql.metadata.strategy.value.jackson.JacksonValueMapperFactory;
+import jakarta.annotation.PostConstruct;
 import javassist.CannotCompileException;
 import javassist.NotFoundException;
 
@@ -92,11 +89,11 @@ public ServletServerContainerFactoryBean createServletServerContainerFactoryBean
   }
 
   @Bean
-  public ExtensionProvider<GeneratorConfiguration, ResolverInterceptorFactory> test() {
-    return (c, r) -> {
-      r.add(params -> List.of(new ExceptionResolverInterceptor(errorMessageService)));
-      return r;
-    };
+  public GraphQL graphQL(GraphQLSchema schema)
+  {
+    return GraphQL.newGraphQL(schema)
+      .queryExecutionStrategy(new AsyncExecutionStrategy(new CustomExceptionHandler(errorMessageService)))
+      .mutationExecutionStrategy(new AsyncSerialExecutionStrategy(new CustomExceptionHandler(errorMessageService)))
+      .build();
   }
-  
 }
diff --git a/src/main/java/app/milo/server/base/address/base/AddressApi.java b/src/main/java/app/milo/server/base/address/base/AddressApi.java
index eefc3b04..498c98bb 100644
--- a/src/main/java/app/milo/server/base/address/base/AddressApi.java
+++ b/src/main/java/app/milo/server/base/address/base/AddressApi.java
@@ -2,9 +2,7 @@
 
 import java.util.List;
 import java.util.Optional;
-
 import javax.naming.ServiceUnavailableException;
-
 import org.springframework.stereotype.Component;
 import app.milo.server.base.address.authorization.permissions.AddressAdminPermission;
 import app.milo.server.core.base.CrudApi;
diff --git a/src/main/java/app/milo/server/base/address/base/AddressEntity.java b/src/main/java/app/milo/server/base/address/base/AddressEntity.java
index 3c4673b7..9ad1c889 100644
--- a/src/main/java/app/milo/server/base/address/base/AddressEntity.java
+++ b/src/main/java/app/milo/server/base/address/base/AddressEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.base.address.base;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.base.address.suburb.SuburbEntity;
 import app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/address/base/AddressService.java b/src/main/java/app/milo/server/base/address/base/AddressService.java
index faf59906..f6498f06 100644
--- a/src/main/java/app/milo/server/base/address/base/AddressService.java
+++ b/src/main/java/app/milo/server/base/address/base/AddressService.java
@@ -1,11 +1,8 @@
 package app.milo.server.base.address.base;
 
 import java.util.Optional;
-
 import javax.naming.ServiceUnavailableException;
-
 import org.springframework.stereotype.Service;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import app.milo.server.base.address.suburb.SuburbService;
 import app.milo.server.core.base.DataService;
diff --git a/src/main/java/app/milo/server/base/address/suburb/SuburbEntity.java b/src/main/java/app/milo/server/base/address/suburb/SuburbEntity.java
index cb0b0c84..52cc1b82 100644
--- a/src/main/java/app/milo/server/base/address/suburb/SuburbEntity.java
+++ b/src/main/java/app/milo/server/base/address/suburb/SuburbEntity.java
@@ -2,11 +2,11 @@
 
 import java.util.Set;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.address.base.AddressEntity;
 import app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/adminFooter/item/AdminFooterItemEntity.java b/src/main/java/app/milo/server/base/adminFooter/item/AdminFooterItemEntity.java
index ac2e1123..722804cd 100644
--- a/src/main/java/app/milo/server/base/adminFooter/item/AdminFooterItemEntity.java
+++ b/src/main/java/app/milo/server/base/adminFooter/item/AdminFooterItemEntity.java
@@ -2,13 +2,13 @@
 
 import java.util.Set;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.adminFooter.item.translations.AdminFooterItemTranslatableEntity;
 import app.milo.server.base.adminFooter.parent.AdminFooterParentEntity;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/base/adminFooter/item/translations/AdminFooterItemTranslatableEntity.java b/src/main/java/app/milo/server/base/adminFooter/item/translations/AdminFooterItemTranslatableEntity.java
index 12a74098..73505a54 100644
--- a/src/main/java/app/milo/server/base/adminFooter/item/translations/AdminFooterItemTranslatableEntity.java
+++ b/src/main/java/app/milo/server/base/adminFooter/item/translations/AdminFooterItemTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.base.adminFooter.item.translations;
 
-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 app.milo.server.base.adminFooter.item.AdminFooterItemEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/adminFooter/parent/AdminFooterParentEntity.java b/src/main/java/app/milo/server/base/adminFooter/parent/AdminFooterParentEntity.java
index 26d82d8c..479880aa 100644
--- a/src/main/java/app/milo/server/base/adminFooter/parent/AdminFooterParentEntity.java
+++ b/src/main/java/app/milo/server/base/adminFooter/parent/AdminFooterParentEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.base.adminFooter.parent;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.adminFooter.item.AdminFooterItemEntity;
 import app.milo.server.base.adminFooter.parent.translations.AdminFooterParentTranslatableEntity;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/base/adminFooter/parent/translations/AdminFooterParentTranslatableEntity.java b/src/main/java/app/milo/server/base/adminFooter/parent/translations/AdminFooterParentTranslatableEntity.java
index 62848c76..3fe7be67 100644
--- a/src/main/java/app/milo/server/base/adminFooter/parent/translations/AdminFooterParentTranslatableEntity.java
+++ b/src/main/java/app/milo/server/base/adminFooter/parent/translations/AdminFooterParentTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.base.adminFooter.parent.translations;
 
-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 app.milo.server.base.adminFooter.parent.AdminFooterParentEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/analytics/rating/RatableEntity.java b/src/main/java/app/milo/server/base/analytics/rating/RatableEntity.java
index 3838d196..c1756221 100644
--- a/src/main/java/app/milo/server/base/analytics/rating/RatableEntity.java
+++ b/src/main/java/app/milo/server/base/analytics/rating/RatableEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.base.analytics.rating;
 
-import javax.persistence.Column;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Column;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
 import lombok.Getter;
diff --git a/src/main/java/app/milo/server/base/cms/components/menuItem/MenuItemEntity.java b/src/main/java/app/milo/server/base/cms/components/menuItem/MenuItemEntity.java
index 2c39ef20..e713e902 100644
--- a/src/main/java/app/milo/server/base/cms/components/menuItem/MenuItemEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/menuItem/MenuItemEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.base.cms.components.menuItem;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.cms.components.menuItem.translations.MenuItemTranslatableEntity;
 import app.milo.server.base.cms.components.page.base.PageEntity;
 import app.milo.server.base.cms.components.plugin.PluginEntity;
diff --git a/src/main/java/app/milo/server/base/cms/components/menuItem/translations/MenuItemTranslatableEntity.java b/src/main/java/app/milo/server/base/cms/components/menuItem/translations/MenuItemTranslatableEntity.java
index fbf68da0..a8f41ae6 100644
--- a/src/main/java/app/milo/server/base/cms/components/menuItem/translations/MenuItemTranslatableEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/menuItem/translations/MenuItemTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.base.cms.components.menuItem.translations;
 
-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 app.milo.server.base.cms.components.menuItem.MenuItemEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/cms/components/page/attribute/PageAttributeEntity.java b/src/main/java/app/milo/server/base/cms/components/page/attribute/PageAttributeEntity.java
index 5ddf6d60..1ea988da 100644
--- a/src/main/java/app/milo/server/base/cms/components/page/attribute/PageAttributeEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/page/attribute/PageAttributeEntity.java
@@ -1,12 +1,12 @@
 package app.milo.server.base.cms.components.page.attribute;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.cms.components.page.attribute.translations.PageAttributeTranslatableEntity;
 import app.milo.server.base.cms.components.page.attributeReference.PageAttributeReferenceEntity;
 import app.milo.server.base.cms.components.page.attributeType.PageAttributeTypeEntity;
diff --git a/src/main/java/app/milo/server/base/cms/components/page/attribute/translations/PageAttributeTranslatableEntity.java b/src/main/java/app/milo/server/base/cms/components/page/attribute/translations/PageAttributeTranslatableEntity.java
index d27184b9..3c4ea2ea 100644
--- a/src/main/java/app/milo/server/base/cms/components/page/attribute/translations/PageAttributeTranslatableEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/page/attribute/translations/PageAttributeTranslatableEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.base.cms.components.page.attribute.translations;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.base.cms.components.page.attribute.PageAttributeEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/cms/components/page/attributeReference/PageAttributeReferenceEntity.java b/src/main/java/app/milo/server/base/cms/components/page/attributeReference/PageAttributeReferenceEntity.java
index e95e5adb..5f4961a6 100644
--- a/src/main/java/app/milo/server/base/cms/components/page/attributeReference/PageAttributeReferenceEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/page/attributeReference/PageAttributeReferenceEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.base.cms.components.page.attributeReference;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.base.cms.components.page.attribute.PageAttributeEntity;
 import app.milo.server.base.cms.components.plugin.PluginEntity;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/base/cms/components/page/attributeType/PageAttributeTypeEntity.java b/src/main/java/app/milo/server/base/cms/components/page/attributeType/PageAttributeTypeEntity.java
index 2fc742a0..335b9089 100644
--- a/src/main/java/app/milo/server/base/cms/components/page/attributeType/PageAttributeTypeEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/page/attributeType/PageAttributeTypeEntity.java
@@ -3,21 +3,18 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import org.hibernate.annotations.CollectionId;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Type;
 import app.milo.server.base.cms.components.page.attribute.PageAttributeEntity;
 import app.milo.server.base.cms.components.page.embeddingType.PageEmbeddingTypeEntity;
 import app.milo.server.core.base.BaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -30,7 +27,6 @@
 @AllArgsConstructor
 @Entity
 @Table(name = "page_attribute_types")
-@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
 public class PageAttributeTypeEntity extends BaseEntity {
 
   private static final long serialVersionUID = 1L;
@@ -46,7 +42,6 @@ public class PageAttributeTypeEntity extends BaseEntity {
     joinColumns = @JoinColumn(name = "attribute_type_id"),
     inverseJoinColumns = @JoinColumn(name = "embedding_type_id"),
     uniqueConstraints = {@UniqueConstraint(columnNames = {"attribute_type_id", "embedding_type_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<PageEmbeddingTypeEntity> embeddingTypes = new ArrayList<>();
 
 }
diff --git a/src/main/java/app/milo/server/base/cms/components/page/base/PageEntity.java b/src/main/java/app/milo/server/base/cms/components/page/base/PageEntity.java
index 16d1432d..ad2111a8 100644
--- a/src/main/java/app/milo/server/base/cms/components/page/base/PageEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/page/base/PageEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.base.cms.components.page.base;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.cms.components.menuItem.MenuItemEntity;
 import app.milo.server.base.cms.components.page.base.visitors.PageVisitorEntity;
@@ -26,7 +26,6 @@
 @AllArgsConstructor
 @Entity
 @Table(name = "pages")
-@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
 public class PageEntity extends BaseEntity {
 
   private static final long serialVersionUID = 1L;
diff --git a/src/main/java/app/milo/server/base/cms/components/page/base/visitors/PageVisitorEntity.java b/src/main/java/app/milo/server/base/cms/components/page/base/visitors/PageVisitorEntity.java
index 07b70892..b82c87f9 100644
--- a/src/main/java/app/milo/server/base/cms/components/page/base/visitors/PageVisitorEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/page/base/visitors/PageVisitorEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.base.cms.components.page.base.visitors;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.base.cms.components.page.base.PageEntity;
 import app.milo.server.core.visit.visitable.VisitableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/cms/components/page/embedding/PageEmbeddingEntity.java b/src/main/java/app/milo/server/base/cms/components/page/embedding/PageEmbeddingEntity.java
index d3955306..1f360dad 100644
--- a/src/main/java/app/milo/server/base/cms/components/page/embedding/PageEmbeddingEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/page/embedding/PageEmbeddingEntity.java
@@ -1,13 +1,13 @@
 package app.milo.server.base.cms.components.page.embedding;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.cms.components.page.attribute.PageAttributeEntity;
 import app.milo.server.base.cms.components.page.base.PageEntity;
 import app.milo.server.base.cms.components.page.embeddingType.PageEmbeddingTypeEntity;
diff --git a/src/main/java/app/milo/server/base/cms/components/page/embeddingType/PageEmbeddingTypeEntity.java b/src/main/java/app/milo/server/base/cms/components/page/embeddingType/PageEmbeddingTypeEntity.java
index f1608432..055d6799 100644
--- a/src/main/java/app/milo/server/base/cms/components/page/embeddingType/PageEmbeddingTypeEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/page/embeddingType/PageEmbeddingTypeEntity.java
@@ -3,23 +3,20 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import org.hibernate.annotations.CollectionId;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Type;
 import app.milo.server.base.cms.components.page.attributeType.PageAttributeTypeEntity;
 import app.milo.server.base.cms.components.page.embedding.PageEmbeddingEntity;
 import app.milo.server.base.cms.components.page.embeddingType.translations.PageEmbeddingTypeTranslatableEntity;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -32,7 +29,6 @@
 @AllArgsConstructor
 @Entity
 @Table(name = "page_embedding_types")
-@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
 public class PageEmbeddingTypeEntity extends BaseEntity {
 
   private static final long serialVersionUID = 1L;
@@ -57,7 +53,6 @@ public class PageEmbeddingTypeEntity extends BaseEntity {
     joinColumns = @JoinColumn(name = "embedding_type_id"),
     inverseJoinColumns = @JoinColumn(name = "attribute_type_id"),
     uniqueConstraints = {@UniqueConstraint(columnNames = {"embedding_type_id", "attribute_type_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<PageAttributeTypeEntity> attributes = new ArrayList<>();
 
 }
diff --git a/src/main/java/app/milo/server/base/cms/components/page/embeddingType/translations/PageEmbeddingTypeTranslatableEntity.java b/src/main/java/app/milo/server/base/cms/components/page/embeddingType/translations/PageEmbeddingTypeTranslatableEntity.java
index 7bae4c72..89fcdadb 100644
--- a/src/main/java/app/milo/server/base/cms/components/page/embeddingType/translations/PageEmbeddingTypeTranslatableEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/page/embeddingType/translations/PageEmbeddingTypeTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.base.cms.components.page.embeddingType.translations;
 
-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 app.milo.server.base.cms.components.page.embeddingType.PageEmbeddingTypeEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/cms/components/plugin/PluginEntity.java b/src/main/java/app/milo/server/base/cms/components/plugin/PluginEntity.java
index 0c5a4c11..fee06755 100644
--- a/src/main/java/app/milo/server/base/cms/components/plugin/PluginEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/plugin/PluginEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.base.cms.components.plugin;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.cms.components.menuItem.MenuItemEntity;
 import app.milo.server.base.cms.components.plugin.translations.PluginTranslatableEntity;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/base/cms/components/plugin/translations/PluginTranslatableEntity.java b/src/main/java/app/milo/server/base/cms/components/plugin/translations/PluginTranslatableEntity.java
index 0991cd7b..04cb9468 100644
--- a/src/main/java/app/milo/server/base/cms/components/plugin/translations/PluginTranslatableEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/plugin/translations/PluginTranslatableEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.base.cms.components.plugin.translations;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.base.cms.components.plugin.PluginEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/cms/components/theme/ThemeEntity.java b/src/main/java/app/milo/server/base/cms/components/theme/ThemeEntity.java
index e46b0e8a..04b82658 100644
--- a/src/main/java/app/milo/server/base/cms/components/theme/ThemeEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/theme/ThemeEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.base.cms.components.theme;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.cms.components.themeVariable.ThemeVariableEntity;
 import app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/cms/components/themeVariable/ThemeVariableEntity.java b/src/main/java/app/milo/server/base/cms/components/themeVariable/ThemeVariableEntity.java
index cd78389a..e6ace7ae 100644
--- a/src/main/java/app/milo/server/base/cms/components/themeVariable/ThemeVariableEntity.java
+++ b/src/main/java/app/milo/server/base/cms/components/themeVariable/ThemeVariableEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.base.cms.components.themeVariable;
 
-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.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.base.cms.components.theme.ThemeEntity;
 import app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/configuration/ConfigurationEntity.java b/src/main/java/app/milo/server/base/configuration/ConfigurationEntity.java
index 1cec8e0c..d88d6ed5 100644
--- a/src/main/java/app/milo/server/base/configuration/ConfigurationEntity.java
+++ b/src/main/java/app/milo/server/base/configuration/ConfigurationEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.base.configuration;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/contact/ContactEntity.java b/src/main/java/app/milo/server/base/contact/ContactEntity.java
index a377eb38..9f3e9377 100644
--- a/src/main/java/app/milo/server/base/contact/ContactEntity.java
+++ b/src/main/java/app/milo/server/base/contact/ContactEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.base.contact;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/app/milo/server/base/db/SuburbMigration.java b/src/main/java/app/milo/server/base/db/SuburbMigration.java
index 71257de5..ef8387b9 100644
--- a/src/main/java/app/milo/server/base/db/SuburbMigration.java
+++ b/src/main/java/app/milo/server/base/db/SuburbMigration.java
@@ -3,7 +3,6 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.sql.SQLException;
-
 import javax.naming.ServiceUnavailableException;
 import app.milo.server.base.address.base.AddressEntity;
 import app.milo.server.base.address.suburb.SuburbEntity;
diff --git a/src/main/java/app/milo/server/base/milestone/MilestoneEntity.java b/src/main/java/app/milo/server/base/milestone/MilestoneEntity.java
index 8279ab93..a04b7f88 100644
--- a/src/main/java/app/milo/server/base/milestone/MilestoneEntity.java
+++ b/src/main/java/app/milo/server/base/milestone/MilestoneEntity.java
@@ -2,11 +2,11 @@
 
 import java.time.OffsetDateTime;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.milestone.element.MilestoneElementEntity;
 import app.milo.server.base.milestone.media.MilestoneMediaEntity;
diff --git a/src/main/java/app/milo/server/base/milestone/element/MilestoneElementEntity.java b/src/main/java/app/milo/server/base/milestone/element/MilestoneElementEntity.java
index 06fdc373..7ba6d454 100644
--- a/src/main/java/app/milo/server/base/milestone/element/MilestoneElementEntity.java
+++ b/src/main/java/app/milo/server/base/milestone/element/MilestoneElementEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.base.milestone.element;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.milestone.MilestoneEntity;
 import app.milo.server.base.milestone.element.translations.MilestoneElementTranslatableEntity;
diff --git a/src/main/java/app/milo/server/base/milestone/element/translations/MilestoneElementTranslatableEntity.java b/src/main/java/app/milo/server/base/milestone/element/translations/MilestoneElementTranslatableEntity.java
index 80f43731..dc11f20d 100644
--- a/src/main/java/app/milo/server/base/milestone/element/translations/MilestoneElementTranslatableEntity.java
+++ b/src/main/java/app/milo/server/base/milestone/element/translations/MilestoneElementTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.base.milestone.element.translations;
 
-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 app.milo.server.base.milestone.element.MilestoneElementEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/milestone/media/MilestoneMediaEntity.java b/src/main/java/app/milo/server/base/milestone/media/MilestoneMediaEntity.java
index a7a7ab7e..4105b08f 100644
--- a/src/main/java/app/milo/server/base/milestone/media/MilestoneMediaEntity.java
+++ b/src/main/java/app/milo/server/base/milestone/media/MilestoneMediaEntity.java
@@ -1,9 +1,9 @@
 package app.milo.server.base.milestone.media;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.base.milestone.MilestoneEntity;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
diff --git a/src/main/java/app/milo/server/base/milestone/translations/MilestoneTranslatableEntity.java b/src/main/java/app/milo/server/base/milestone/translations/MilestoneTranslatableEntity.java
index f6e74f63..4a136523 100644
--- a/src/main/java/app/milo/server/base/milestone/translations/MilestoneTranslatableEntity.java
+++ b/src/main/java/app/milo/server/base/milestone/translations/MilestoneTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.base.milestone.translations;
 
-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 app.milo.server.base.milestone.MilestoneEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/report/base/ReportEntity.java b/src/main/java/app/milo/server/base/report/base/ReportEntity.java
index 8dd49b51..157908ea 100644
--- a/src/main/java/app/milo/server/base/report/base/ReportEntity.java
+++ b/src/main/java/app/milo/server/base/report/base/ReportEntity.java
@@ -1,13 +1,13 @@
 package app.milo.server.base.report.base;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.report.base.media.ReportMediaEntity;
 import app.milo.server.base.report.base.translations.ReportTranslatableEntity;
diff --git a/src/main/java/app/milo/server/base/report/base/media/ReportMediaEntity.java b/src/main/java/app/milo/server/base/report/base/media/ReportMediaEntity.java
index 85fd293d..3cebf0be 100644
--- a/src/main/java/app/milo/server/base/report/base/media/ReportMediaEntity.java
+++ b/src/main/java/app/milo/server/base/report/base/media/ReportMediaEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.base.report.base.media;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.base.report.base.ReportEntity;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
diff --git a/src/main/java/app/milo/server/base/report/base/translations/ReportTranslatableEntity.java b/src/main/java/app/milo/server/base/report/base/translations/ReportTranslatableEntity.java
index dd30623b..20a4aab4 100644
--- a/src/main/java/app/milo/server/base/report/base/translations/ReportTranslatableEntity.java
+++ b/src/main/java/app/milo/server/base/report/base/translations/ReportTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.base.report.base.translations;
 
-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 app.milo.server.base.report.base.ReportEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/report/type/ReportTypeEntity.java b/src/main/java/app/milo/server/base/report/type/ReportTypeEntity.java
index c588ca33..b3260165 100644
--- a/src/main/java/app/milo/server/base/report/type/ReportTypeEntity.java
+++ b/src/main/java/app/milo/server/base/report/type/ReportTypeEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.base.report.type;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.report.base.ReportEntity;
 import app.milo.server.base.report.type.translations.ReportTypeTranslatableEntity;
diff --git a/src/main/java/app/milo/server/base/report/type/translations/ReportTypeTranslatableEntity.java b/src/main/java/app/milo/server/base/report/type/translations/ReportTypeTranslatableEntity.java
index 8c98f9b4..95297db5 100644
--- a/src/main/java/app/milo/server/base/report/type/translations/ReportTypeTranslatableEntity.java
+++ b/src/main/java/app/milo/server/base/report/type/translations/ReportTypeTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.base.report.type.translations;
 
-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 app.milo.server.base.report.type.ReportTypeEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/thirdparty/app/AppEntity.java b/src/main/java/app/milo/server/base/thirdparty/app/AppEntity.java
index 3d177873..9f2292ae 100644
--- a/src/main/java/app/milo/server/base/thirdparty/app/AppEntity.java
+++ b/src/main/java/app/milo/server/base/thirdparty/app/AppEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.base.thirdparty.app;
 
-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.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.base.thirdparty.appPlatform.AppPlatformEntity;
 import app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/thirdparty/appPlatform/AppPlatformEntity.java b/src/main/java/app/milo/server/base/thirdparty/appPlatform/AppPlatformEntity.java
index 308e9371..fa2891ae 100644
--- a/src/main/java/app/milo/server/base/thirdparty/appPlatform/AppPlatformEntity.java
+++ b/src/main/java/app/milo/server/base/thirdparty/appPlatform/AppPlatformEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.base.thirdparty.appPlatform;
 
-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 app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/app/milo/server/base/thirdparty/socialMedia/SocialMediaEntity.java b/src/main/java/app/milo/server/base/thirdparty/socialMedia/SocialMediaEntity.java
index 17339433..355bbd7e 100644
--- a/src/main/java/app/milo/server/base/thirdparty/socialMedia/SocialMediaEntity.java
+++ b/src/main/java/app/milo/server/base/thirdparty/socialMedia/SocialMediaEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.base.thirdparty.socialMedia;
 
-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 app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/app/milo/server/base/userContext/base/UserContextEntity.java b/src/main/java/app/milo/server/base/userContext/base/UserContextEntity.java
index 2ce7efff..e9abc891 100644
--- a/src/main/java/app/milo/server/base/userContext/base/UserContextEntity.java
+++ b/src/main/java/app/milo/server/base/userContext/base/UserContextEntity.java
@@ -3,19 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import org.hibernate.annotations.CollectionId;
-import org.hibernate.annotations.Type;
 import app.milo.server.base.address.base.AddressEntity;
 import app.milo.server.base.contact.ContactEntity;
 import app.milo.server.base.userContext.base.media.UserContextMediaEntity;
@@ -39,6 +26,16 @@
 import app.milo.server.features.organisation.rating.OrganisationRatingEntity;
 import app.milo.server.features.survey.assignment.SurveyAssignmentEntity;
 import app.milo.server.features.survey.result.SurveyResultEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -125,49 +122,42 @@ public class UserContextEntity extends BaseEntity {
   @JoinTable(name = "user_context_contacts", joinColumns = @JoinColumn(name = "user_context_id"),
       inverseJoinColumns = @JoinColumn(name = "contact_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "contact_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<ContactEntity> contacts = new ArrayList<>();
   
   @ManyToMany(fetch = FetchType.LAZY)
   @JoinTable(name = "favorite_articles", joinColumns = @JoinColumn(name = "user_context_id"),
       inverseJoinColumns = @JoinColumn(name = "article_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "article_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<ArticleEntity> favoriteArticles = new ArrayList<>();
   
   @ManyToMany(fetch = FetchType.LAZY)
   @JoinTable(name = "favorite_authors", joinColumns = @JoinColumn(name = "user_context_id"),
       inverseJoinColumns = @JoinColumn(name = "author_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "author_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<UserContextEntity> favoriteAuthors = new ArrayList<>();
   
   @ManyToMany(fetch = FetchType.LAZY)
   @JoinTable(name = "favorite_authors", joinColumns = @JoinColumn(name = "author_id"),
       inverseJoinColumns = @JoinColumn(name = "user_context_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "author_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<UserContextEntity> favoritingUsers = new ArrayList<>();
   
   @ManyToMany(fetch = FetchType.LAZY)
   @JoinTable(name = "favorite_events", joinColumns = @JoinColumn(name = "user_context_id"),
 	  inverseJoinColumns = @JoinColumn(name = "event_id"),
 	  uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "event_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<EventEntity> favoriteEvents = new ArrayList<>();
   
   @ManyToMany(fetch = FetchType.LAZY)
   @JoinTable(name = "favorite_deals", joinColumns = @JoinColumn(name = "user_context_id"),
       inverseJoinColumns = @JoinColumn(name = "deal_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "deal_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<DealEntity> favoriteDeals = new ArrayList<>();
   
   @ManyToMany(fetch = FetchType.LAZY)
   @JoinTable(name = "favorite_organisations", joinColumns = @JoinColumn(name = "user_context_id"),
       inverseJoinColumns = @JoinColumn(name = "organisation_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "organisation_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<OrganisationEntity> favoriteOrganisations = new ArrayList<>();
 
 }
diff --git a/src/main/java/app/milo/server/base/userContext/base/media/UserContextMediaEntity.java b/src/main/java/app/milo/server/base/userContext/base/media/UserContextMediaEntity.java
index 614a9599..f3e1f063 100644
--- a/src/main/java/app/milo/server/base/userContext/base/media/UserContextMediaEntity.java
+++ b/src/main/java/app/milo/server/base/userContext/base/media/UserContextMediaEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.base.userContext.base.media;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
diff --git a/src/main/java/app/milo/server/base/userContext/base/translations/UserContextTranslatableEntity.java b/src/main/java/app/milo/server/base/userContext/base/translations/UserContextTranslatableEntity.java
index dfe7e0f1..aee6608d 100644
--- a/src/main/java/app/milo/server/base/userContext/base/translations/UserContextTranslatableEntity.java
+++ b/src/main/java/app/milo/server/base/userContext/base/translations/UserContextTranslatableEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.base.userContext.base.translations;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/base/userContext/friend/FriendEntity.java b/src/main/java/app/milo/server/base/userContext/friend/FriendEntity.java
index 926fd17a..4179c532 100644
--- a/src/main/java/app/milo/server/base/userContext/friend/FriendEntity.java
+++ b/src/main/java/app/milo/server/base/userContext/friend/FriendEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.base.userContext.friend;
 
-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.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/core/base/BaseEntity.java b/src/main/java/app/milo/server/core/base/BaseEntity.java
index 53a31f98..4dd9c9e0 100644
--- a/src/main/java/app/milo/server/core/base/BaseEntity.java
+++ b/src/main/java/app/milo/server/core/base/BaseEntity.java
@@ -5,10 +5,10 @@
 import java.time.OffsetDateTime;
 import java.util.Objects;
 
-import javax.persistence.Column;
-import javax.persistence.EntityListeners;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Column;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
diff --git a/src/main/java/app/milo/server/core/base/DataService.java b/src/main/java/app/milo/server/core/base/DataService.java
index 3d3e7e3f..6fb3a110 100644
--- a/src/main/java/app/milo/server/core/base/DataService.java
+++ b/src/main/java/app/milo/server/core/base/DataService.java
@@ -12,10 +12,10 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import javax.persistence.EntityGraph;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
 
 import org.hibernate.Hibernate;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/app/milo/server/core/base/GraphBuilder.java b/src/main/java/app/milo/server/core/base/GraphBuilder.java
index 09636348..3d34800b 100644
--- a/src/main/java/app/milo/server/core/base/GraphBuilder.java
+++ b/src/main/java/app/milo/server/core/base/GraphBuilder.java
@@ -5,12 +5,12 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Transient;
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Transient;
 
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.graph.EntityGraphs;
diff --git a/src/main/java/app/milo/server/core/config/MultiReadHttpServletRequest.java b/src/main/java/app/milo/server/core/config/MultiReadHttpServletRequest.java
index a4d0a307..a05be643 100644
--- a/src/main/java/app/milo/server/core/config/MultiReadHttpServletRequest.java
+++ b/src/main/java/app/milo/server/core/config/MultiReadHttpServletRequest.java
@@ -6,10 +6,10 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 import org.apache.tomcat.util.http.fileupload.IOUtils;
 
diff --git a/src/main/java/app/milo/server/core/config/RequestFilter.java b/src/main/java/app/milo/server/core/config/RequestFilter.java
index 50f6623a..161fdf67 100644
--- a/src/main/java/app/milo/server/core/config/RequestFilter.java
+++ b/src/main/java/app/milo/server/core/config/RequestFilter.java
@@ -2,12 +2,12 @@
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/app/milo/server/core/context/GraphQlContextAdapter.java b/src/main/java/app/milo/server/core/context/GraphQlContextAdapter.java
index 27cc2588..437e82a3 100644
--- a/src/main/java/app/milo/server/core/context/GraphQlContextAdapter.java
+++ b/src/main/java/app/milo/server/core/context/GraphQlContextAdapter.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/app/milo/server/core/error/CustomExceptionHandler.java b/src/main/java/app/milo/server/core/error/CustomExceptionHandler.java
new file mode 100644
index 00000000..602e85e0
--- /dev/null
+++ b/src/main/java/app/milo/server/core/error/CustomExceptionHandler.java
@@ -0,0 +1,44 @@
+package app.milo.server.core.error;
+
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import org.springframework.stereotype.Service;
+import app.milo.server.core.error.errorMessage.ErrorMessageService;
+import graphql.GraphqlErrorBuilder;
+import graphql.execution.DataFetcherExceptionHandler;
+import graphql.execution.DataFetcherExceptionHandlerParameters;
+import graphql.execution.DataFetcherExceptionHandlerResult;
+
+@Service
+public class CustomExceptionHandler implements DataFetcherExceptionHandler {
+
+  private final ErrorMessageService errorMessageService;
+
+  public CustomExceptionHandler(ErrorMessageService errorMessageService) {
+      this.errorMessageService = errorMessageService;
+  }
+
+  @Override
+  public CompletableFuture<DataFetcherExceptionHandlerResult> handleException(
+      DataFetcherExceptionHandlerParameters handlerParameters) {
+    var exception = handlerParameters.getException();
+    var localizedMessage = errorMessageService.getLocalizedMessageByException(exception);
+    var path = handlerParameters.getPath();
+    var sourceLocation = handlerParameters.getSourceLocation();
+    
+    exception.printStackTrace();
+
+    var errorBuilder = GraphqlErrorBuilder.newError()
+            .message(localizedMessage)
+            .path(path)
+            .location(sourceLocation)
+            .extensions(Map.of(
+                    "exception", exception.getClass().getSimpleName(),
+                    "originalMessage", exception.getMessage() != null ? exception.getMessage() : ""));
+
+    return CompletableFuture.completedFuture(DataFetcherExceptionHandlerResult.newResult()
+            .error(errorBuilder.build())
+            .build());
+  } 
+ 
+}
\ No newline at end of file
diff --git a/src/main/java/app/milo/server/core/error/ExceptionResolverInterceptor.java b/src/main/java/app/milo/server/core/error/ExceptionResolverInterceptor.java
deleted file mode 100644
index 79083364..00000000
--- a/src/main/java/app/milo/server/core/error/ExceptionResolverInterceptor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package app.milo.server.core.error;
-
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-import app.milo.server.core.error.errorMessage.ErrorMessageService;
-import graphql.GraphqlErrorBuilder;
-import graphql.execution.DataFetcherResult;
-import io.leangen.graphql.execution.InvocationContext;
-import io.leangen.graphql.execution.ResolverInterceptor;
-
-@Service
-public class ExceptionResolverInterceptor implements ResolverInterceptor {
-
-  private ErrorMessageService errorMessageService;
-
-  public ExceptionResolverInterceptor(ErrorMessageService errorMessageService) {
-    this.errorMessageService = errorMessageService;
-  }
-
-  @Override
-  public Object aroundInvoke(InvocationContext context, Continuation continuation)
-      throws Exception {
-    try {
-      return continuation.proceed(context);
-    } catch (Exception e) {
-      e.printStackTrace();
-      try {
-        return createErrorObject(context, e);
-      } catch (Throwable e1) {
-        e1.printStackTrace();
-      }
-    }
-    return continuation;
-  }
-
-  public Object createErrorObject(InvocationContext context, Exception e) throws Throwable {
-    return DataFetcherResult.newResult()
-        .error(
-            GraphqlErrorBuilder.newError(context.getResolutionEnvironment().dataFetchingEnvironment)
-                .message(errorMessageService.getLocalizedMessageByException(e))
-                .extensions(Map.of(
-                    "exception", e.getClass().getSimpleName(),
-                    "originalMessage", e.getMessage() != null ? e.getMessage() : ""))
-                .build())
-        .build();
-  }
-}
diff --git a/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageEntity.java b/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageEntity.java
index d01ca6a0..8973ab2b 100644
--- a/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageEntity.java
+++ b/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageEntity.java
@@ -1,9 +1,9 @@
 package app.milo.server.core.error.errorMessage;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.components.language.LanguageEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageService.java b/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageService.java
index 5fb69329..f8a62201 100644
--- a/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageService.java
+++ b/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageService.java
@@ -35,70 +35,70 @@ public ErrorMessageService(DataRepository<ErrorMessageEntity> repo,
   }
 
   // TODO: Get messages from DB
-  public String getLocalizedMessageByException(Exception e) throws Throwable {
+  public String getLocalizedMessageByException(Throwable exception) {
 
-    if (e instanceof AccessDeniedException) {
+    if (exception instanceof AccessDeniedException) {
       return "Benutzer ist nicht authentifiziert. Logge dich ein.";
     }
 
-    if (e instanceof AlreadyVerifiedException) {
+    if (exception instanceof AlreadyVerifiedException) {
       return "Benutzer bereits verfiziert. Logge dich ein.";
     }
 
-    if (e instanceof BadParamsException) {
+    if (exception instanceof BadParamsException) {
       return "Eingaben fehlerhaft. Probiere es mit anderen Eingaben.";
     }
 
-    if (e instanceof DuplicateException) {
+    if (exception instanceof DuplicateException) {
       return "Ein Datensatz mit den Eingaben existiert bereits. Probiere es mit anderen Eingaben.";
     }
 
-    if (e instanceof InvalidPasswordResetException) {
+    if (exception instanceof InvalidPasswordResetException) {
       return "Passwort nicht zurück gesetzt. Generieren Sie eine neue Mail.";
     }
 
-    if (e instanceof InvalidTokenException) {
+    if (exception instanceof InvalidTokenException) {
       return "Sicherheitstoken ungültig. Bitte neu einloggen.";
     }
     
-    if (e instanceof TokenExpiredException) {
+    if (exception instanceof TokenExpiredException) {
       return "Sitzung abgelaufen. Bitte neu einloggen.";
     }
 
-    if (e instanceof BadCredentialsException
-        || e instanceof InternalAuthenticationServiceException) {
+    if (exception instanceof BadCredentialsException
+        || exception instanceof InternalAuthenticationServiceException) {
       return "Benutzername und Passwort falsch";
     }
 
-    if (e instanceof InvalidCaptchaException) {
+    if (exception instanceof InvalidCaptchaException) {
       return "Captcha-Verifikation fehlgeschlagen. Bitte probieren Sie es erneut.";
     }
 
-    if (e instanceof VerificationInvalidException) {
+    if (exception instanceof VerificationInvalidException) {
       return "Verifizierung ungültig. Entweder ist Verifizierung abgelaufen oder bereits verifiziert.";
     }
     
-    if (e instanceof VerificationPendingException) {
+    if (exception instanceof VerificationPendingException) {
       return "Email noch nicht verifiziert.";
     }
     
-    if (e instanceof VerificationUserNotFoundException) {
+    if (exception instanceof VerificationUserNotFoundException) {
       return "Email existiert nicht. Bitte korrekte Email angeben oder registrieren.";
     }
 
-    if (e instanceof NotDeletableException) {
+    if (exception instanceof NotDeletableException) {
       return "Inhalt konnte nicht gelöscht werden, da Referenz auf andere Inhalte existiert. Lösche bitte zunächst die Referenz und probiere es erneut.";
     }
 
-    if (e instanceof NotFoundException) {
+    if (exception instanceof NotFoundException) {
       return "Inhalt(e) konnte(n) nicht gefunden werden. Probiere es mit anderen Eingaben.";
     }
 
-    if (e instanceof NotNullableException) {
+    if (exception instanceof NotNullableException) {
       return "Felder sind leer, die nicht leer sein dürfen.";
     }
 
-    this.errorMailService.sendErrorMail(e);
+    this.errorMailService.sendErrorMail(exception);
     return "Unbekannter Fehler. Wende dich bitte an den Support.";
   }
 
diff --git a/src/main/java/app/milo/server/core/i18n/TranslationPreprocessor.java b/src/main/java/app/milo/server/core/i18n/TranslationPreprocessor.java
index 081a5f59..edcf26e2 100644
--- a/src/main/java/app/milo/server/core/i18n/TranslationPreprocessor.java
+++ b/src/main/java/app/milo/server/core/i18n/TranslationPreprocessor.java
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 
-import javax.persistence.Entity;
-import javax.persistence.Transient;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
 
 import org.reflections.Reflections;
 import org.reflections.util.ClasspathHelper;
diff --git a/src/main/java/app/milo/server/core/i18n/components/label/LabelEntity.java b/src/main/java/app/milo/server/core/i18n/components/label/LabelEntity.java
index eb56c634..1d0dce6d 100644
--- a/src/main/java/app/milo/server/core/i18n/components/label/LabelEntity.java
+++ b/src/main/java/app/milo/server/core/i18n/components/label/LabelEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.core.i18n.components.label;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.core.i18n.components.label.translations.LabelTranslatablesEntity;
diff --git a/src/main/java/app/milo/server/core/i18n/components/label/translations/LabelTranslatablesEntity.java b/src/main/java/app/milo/server/core/i18n/components/label/translations/LabelTranslatablesEntity.java
index 3269babb..830e906e 100644
--- a/src/main/java/app/milo/server/core/i18n/components/label/translations/LabelTranslatablesEntity.java
+++ b/src/main/java/app/milo/server/core/i18n/components/label/translations/LabelTranslatablesEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.core.i18n.components.label.translations;
 
-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 app.milo.server.core.i18n.components.label.LabelEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/core/i18n/components/language/LanguageEntity.java b/src/main/java/app/milo/server/core/i18n/components/language/LanguageEntity.java
index 6e18dede..b51e3f7a 100644
--- a/src/main/java/app/milo/server/core/i18n/components/language/LanguageEntity.java
+++ b/src/main/java/app/milo/server/core/i18n/components/language/LanguageEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.core.i18n.components.language;
 
-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 app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/app/milo/server/core/i18n/entities/TranslatableEntity.java b/src/main/java/app/milo/server/core/i18n/entities/TranslatableEntity.java
index 87ab0f4a..210833c2 100644
--- a/src/main/java/app/milo/server/core/i18n/entities/TranslatableEntity.java
+++ b/src/main/java/app/milo/server/core/i18n/entities/TranslatableEntity.java
@@ -1,9 +1,9 @@
 package app.milo.server.core.i18n.entities;
 
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/core/i18n/translation/LocaleService.java b/src/main/java/app/milo/server/core/i18n/translation/LocaleService.java
index 33eecf30..550c7bff 100644
--- a/src/main/java/app/milo/server/core/i18n/translation/LocaleService.java
+++ b/src/main/java/app/milo/server/core/i18n/translation/LocaleService.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/app/milo/server/core/i18n/translation/TranslationService.java b/src/main/java/app/milo/server/core/i18n/translation/TranslationService.java
index e3cc5bac..ba094d2f 100644
--- a/src/main/java/app/milo/server/core/i18n/translation/TranslationService.java
+++ b/src/main/java/app/milo/server/core/i18n/translation/TranslationService.java
@@ -6,7 +6,7 @@
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 import org.hibernate.Hibernate;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
diff --git a/src/main/java/app/milo/server/core/location/LocationController.java b/src/main/java/app/milo/server/core/location/LocationController.java
index 154188ae..f6854bc7 100644
--- a/src/main/java/app/milo/server/core/location/LocationController.java
+++ b/src/main/java/app/milo/server/core/location/LocationController.java
@@ -1,9 +1,7 @@
 package app.milo.server.core.location;
 
 import static org.springframework.http.ResponseEntity.ok;
-
 import javax.naming.ServiceUnavailableException;
-
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/src/main/java/app/milo/server/core/media/attribution/MediaAttributionEntity.java b/src/main/java/app/milo/server/core/media/attribution/MediaAttributionEntity.java
index bceceda9..d04bd950 100644
--- a/src/main/java/app/milo/server/core/media/attribution/MediaAttributionEntity.java
+++ b/src/main/java/app/milo/server/core/media/attribution/MediaAttributionEntity.java
@@ -1,9 +1,9 @@
 package app.milo.server.core.media.attribution;
 
 import java.io.Serial;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/app/milo/server/core/media/base/MediaEntity.java b/src/main/java/app/milo/server/core/media/base/MediaEntity.java
index d7fba6f8..c65f32b7 100644
--- a/src/main/java/app/milo/server/core/media/base/MediaEntity.java
+++ b/src/main/java/app/milo/server/core/media/base/MediaEntity.java
@@ -1,12 +1,12 @@
 package app.milo.server.core.media.base;
 
 import java.io.Serial;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.context.ApplicationContextAdapter;
 import app.milo.server.core.media.attribution.MediaAttributionEntity;
diff --git a/src/main/java/app/milo/server/core/media/image/ImageListener.java b/src/main/java/app/milo/server/core/media/image/ImageListener.java
index 228bd247..e1039a1e 100644
--- a/src/main/java/app/milo/server/core/media/image/ImageListener.java
+++ b/src/main/java/app/milo/server/core/media/image/ImageListener.java
@@ -1,13 +1,11 @@
 package app.milo.server.core.media.image;
 
-import javax.annotation.ManagedBean;
-import javax.servlet.ServletContext;
-
+import javax.inject.Named;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
-
 import com.twelvemonkeys.servlet.image.IIOProviderContextListener;
+import jakarta.servlet.ServletContext;
 
-@ManagedBean
+@Named
 public class ImageListener implements ServletContextInitializer {
 
   @Override
diff --git a/src/main/java/app/milo/server/core/media/image/ImageService.java b/src/main/java/app/milo/server/core/media/image/ImageService.java
index 2017c063..c1ffed13 100644
--- a/src/main/java/app/milo/server/core/media/image/ImageService.java
+++ b/src/main/java/app/milo/server/core/media/image/ImageService.java
@@ -5,9 +5,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URL;
-
 import javax.imageio.ImageIO;
-
 import org.imgscalr.Scalr;
 import org.imgscalr.Scalr.Method;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/app/milo/server/core/messaging/MailService.java b/src/main/java/app/milo/server/core/messaging/MailService.java
index 077bf317..b8562294 100644
--- a/src/main/java/app/milo/server/core/messaging/MailService.java
+++ b/src/main/java/app/milo/server/core/messaging/MailService.java
@@ -3,8 +3,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.scheduling.annotation.Async;
diff --git a/src/main/java/app/milo/server/core/messaging/channels/ChannelEntity.java b/src/main/java/app/milo/server/core/messaging/channels/ChannelEntity.java
index ce09e146..8bd0ce9f 100644
--- a/src/main/java/app/milo/server/core/messaging/channels/ChannelEntity.java
+++ b/src/main/java/app/milo/server/core/messaging/channels/ChannelEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.core.messaging.channels;
 
-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 app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/app/milo/server/core/messaging/definitions/MessageDefinitionEntity.java b/src/main/java/app/milo/server/core/messaging/definitions/MessageDefinitionEntity.java
index d2349a04..dd5f8211 100644
--- a/src/main/java/app/milo/server/core/messaging/definitions/MessageDefinitionEntity.java
+++ b/src/main/java/app/milo/server/core/messaging/definitions/MessageDefinitionEntity.java
@@ -2,23 +2,20 @@
 
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import org.hibernate.annotations.CollectionId;
-import org.hibernate.annotations.Type;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.messaging.channels.ChannelEntity;
 import app.milo.server.core.messaging.definitions.translations.MessageDefinitionTranslatableEntity;
 import app.milo.server.core.messaging.templates.MessageTemplateEntity;
 import app.milo.server.core.security.components.user.UserEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -48,7 +45,6 @@ public class MessageDefinitionEntity extends BaseEntity {
       inverseJoinColumns = @JoinColumn(name = "channel_id"),
       uniqueConstraints = {
           @UniqueConstraint(columnNames = {"message_definition_id", "channel_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<ChannelEntity> channels;
   
   @ManyToMany(fetch = FetchType.LAZY)
@@ -57,6 +53,5 @@ public class MessageDefinitionEntity extends BaseEntity {
       inverseJoinColumns = @JoinColumn(name = "user_id"),
       uniqueConstraints = {
           @UniqueConstraint(columnNames = {"message_definition_id", "user_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<UserEntity> users;
 }
diff --git a/src/main/java/app/milo/server/core/messaging/definitions/translations/MessageDefinitionTranslatableEntity.java b/src/main/java/app/milo/server/core/messaging/definitions/translations/MessageDefinitionTranslatableEntity.java
index e2abe810..74dc3724 100644
--- a/src/main/java/app/milo/server/core/messaging/definitions/translations/MessageDefinitionTranslatableEntity.java
+++ b/src/main/java/app/milo/server/core/messaging/definitions/translations/MessageDefinitionTranslatableEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.core.messaging.definitions.translations;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.i18n.components.language.LanguageEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.core.messaging.definitions.MessageDefinitionEntity;
diff --git a/src/main/java/app/milo/server/core/messaging/notifications/base/NotificationEntity.java b/src/main/java/app/milo/server/core/messaging/notifications/base/NotificationEntity.java
index ea267d37..394fb0f2 100644
--- a/src/main/java/app/milo/server/core/messaging/notifications/base/NotificationEntity.java
+++ b/src/main/java/app/milo/server/core/messaging/notifications/base/NotificationEntity.java
@@ -1,13 +1,13 @@
 package app.milo.server.core.messaging.notifications.base;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.messaging.notifications.translations.NotificationTranslatableEntity;
 import app.milo.server.core.security.components.user.UserEntity;
diff --git a/src/main/java/app/milo/server/core/messaging/notifications/translations/NotificationTranslatableEntity.java b/src/main/java/app/milo/server/core/messaging/notifications/translations/NotificationTranslatableEntity.java
index 95c6b9bb..e6bd7d34 100644
--- a/src/main/java/app/milo/server/core/messaging/notifications/translations/NotificationTranslatableEntity.java
+++ b/src/main/java/app/milo/server/core/messaging/notifications/translations/NotificationTranslatableEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.core.messaging.notifications.translations;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.i18n.components.language.LanguageEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.core.messaging.notifications.base.NotificationEntity;
diff --git a/src/main/java/app/milo/server/core/messaging/templates/MessageTemplateEntity.java b/src/main/java/app/milo/server/core/messaging/templates/MessageTemplateEntity.java
index 04052591..7d869950 100644
--- a/src/main/java/app/milo/server/core/messaging/templates/MessageTemplateEntity.java
+++ b/src/main/java/app/milo/server/core/messaging/templates/MessageTemplateEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.core.messaging.templates;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.messaging.definitions.MessageDefinitionEntity;
 import app.milo.server.core.messaging.templates.translations.MessageTemplateTranslatableEntity;
diff --git a/src/main/java/app/milo/server/core/messaging/templates/translations/MessageTemplateTranslatableEntity.java b/src/main/java/app/milo/server/core/messaging/templates/translations/MessageTemplateTranslatableEntity.java
index 9940b069..6a56729f 100644
--- a/src/main/java/app/milo/server/core/messaging/templates/translations/MessageTemplateTranslatableEntity.java
+++ b/src/main/java/app/milo/server/core/messaging/templates/translations/MessageTemplateTranslatableEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.core.messaging.templates.translations;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.i18n.components.language.LanguageEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.core.messaging.templates.MessageTemplateEntity;
diff --git a/src/main/java/app/milo/server/core/push/subscription/SubscriptionEntity.java b/src/main/java/app/milo/server/core/push/subscription/SubscriptionEntity.java
index eeb495c6..1ce4e577 100644
--- a/src/main/java/app/milo/server/core/push/subscription/SubscriptionEntity.java
+++ b/src/main/java/app/milo/server/core/push/subscription/SubscriptionEntity.java
@@ -1,12 +1,12 @@
 package app.milo.server.core.push.subscription;
 
 import java.io.Serial;
-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.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.security.components.user.UserEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/core/repository/BaseRepositoryQuery.java b/src/main/java/app/milo/server/core/repository/BaseRepositoryQuery.java
index be38dc92..9c859bc1 100644
--- a/src/main/java/app/milo/server/core/repository/BaseRepositoryQuery.java
+++ b/src/main/java/app/milo/server/core/repository/BaseRepositoryQuery.java
@@ -1,6 +1,6 @@
 package app.milo.server.core.repository;
 
-import javax.persistence.EntityGraph;
+import jakarta.persistence.EntityGraph;
 
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Predicate;
diff --git a/src/main/java/app/milo/server/core/repository/CollectionRepositoryQuery.java b/src/main/java/app/milo/server/core/repository/CollectionRepositoryQuery.java
index b4b5fb21..fe7220f8 100644
--- a/src/main/java/app/milo/server/core/repository/CollectionRepositoryQuery.java
+++ b/src/main/java/app/milo/server/core/repository/CollectionRepositoryQuery.java
@@ -1,6 +1,6 @@
 package app.milo.server.core.repository;
 
-import javax.persistence.EntityGraph;
+import jakarta.persistence.EntityGraph;
 
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
diff --git a/src/main/java/app/milo/server/core/repository/CustomRepositoryFactory.java b/src/main/java/app/milo/server/core/repository/CustomRepositoryFactory.java
index fd930890..fcb93e36 100644
--- a/src/main/java/app/milo/server/core/repository/CustomRepositoryFactory.java
+++ b/src/main/java/app/milo/server/core/repository/CustomRepositoryFactory.java
@@ -1,6 +1,6 @@
 package app.milo.server.core.repository;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
 import org.springframework.data.repository.core.RepositoryMetadata;
diff --git a/src/main/java/app/milo/server/core/repository/CustomRepositoryFactoryBean.java b/src/main/java/app/milo/server/core/repository/CustomRepositoryFactoryBean.java
index 45bf37ab..003311c4 100644
--- a/src/main/java/app/milo/server/core/repository/CustomRepositoryFactoryBean.java
+++ b/src/main/java/app/milo/server/core/repository/CustomRepositoryFactoryBean.java
@@ -1,6 +1,6 @@
 package app.milo.server.core.repository;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
 import org.springframework.data.repository.Repository;
diff --git a/src/main/java/app/milo/server/core/repository/QueryableReadRepositoryImpl.java b/src/main/java/app/milo/server/core/repository/QueryableReadRepositoryImpl.java
index 569f1306..34389ebb 100644
--- a/src/main/java/app/milo/server/core/repository/QueryableReadRepositoryImpl.java
+++ b/src/main/java/app/milo/server/core/repository/QueryableReadRepositoryImpl.java
@@ -2,11 +2,6 @@
 
 import java.util.List;
 import java.util.Optional;
-
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-
-import org.hibernate.annotations.QueryHints;
 import org.hibernate.graph.GraphSemantic;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.data.domain.Page;
@@ -19,7 +14,6 @@
 import org.springframework.data.querydsl.SimpleEntityPathResolver;
 import org.springframework.data.support.PageableExecutionUtils;
 import org.springframework.transaction.annotation.Transactional;
-
 import com.querydsl.core.NonUniqueResultException;
 import com.querydsl.core.types.EntityPath;
 import com.querydsl.core.types.Predicate;
@@ -30,11 +24,12 @@
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.base.dto.listing.PageableList;
 import app.milo.server.core.utils.ReflectionUtils;
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityManager;
 
 @Transactional
 public class QueryableReadRepositoryImpl<T extends BaseEntity> extends QuerydslJpaPredicateExecutor<T>
     implements QueryableReadRepository<T> {
-
   private static final EntityPathResolver resolver = SimpleEntityPathResolver.INSTANCE;
 
   private final EntityPath<T> path;
@@ -59,7 +54,7 @@ public Optional<T> findOne(BaseRepositoryQuery<T> repoQuery) {
       
       var query = createQuery(repoQuery.getPredicate()).select(path);
       if (repoQuery.getGraph() != null) {
-        ((AbstractJPAQuery<?, ?>) query).setHint(GraphSemantic.FETCH.getJpaHintName(),
+        ((AbstractJPAQuery<?, ?>) query).setHint(GraphSemantic.FETCH.getJakartaHintName(),
             repoQuery.getGraph());
       }
       return Optional.ofNullable(query.fetchOne());
@@ -82,22 +77,19 @@ public Page<T> findAll(Predicate predicate, Pageable pageable, EntityGraph<T> gr
       throw new RuntimeException(path.getType().getName() + " has no id property");
     }
     
-    final JPQLQuery<?> countQuery = createCountQuery(predicate).distinct();
+    final JPQLQuery<?> countQuery = createCountQuery(predicate);
     JPQLQuery<T> query = querydsl
         .applySorting(pageable.getSort(), createQuery(
             idPath.get().in(fetchIds(predicate, pageable, idPath.get())))
-        .distinct()
+//        .
         .select(path));
     
-    ((AbstractJPAQuery<?, ?>) query).setHint(QueryHints.PASS_DISTINCT_THROUGH, false);
-    ((AbstractJPAQuery<?, ?>) countQuery).setHint(QueryHints.PASS_DISTINCT_THROUGH, false);
-    
     if (graph != null) {
-      ((AbstractJPAQuery<?, ?>) query).setHint(GraphSemantic.FETCH.getJpaHintName(), graph); 
+      ((AbstractJPAQuery<?, ?>) query).setHint(GraphSemantic.FETCH.getJakartaHintName(), graph); 
     }
     
     return PageableExecutionUtils.getPage(
-        query.distinct().fetch(), 
+        query.fetch(), 
         pageable, 
         countQuery::fetchCount);
   }
@@ -106,8 +98,7 @@ private List<String> fetchIds(
       Predicate predicate, 
       Pageable pageable,
       StringPath id) {
-    var idQuery = createQuery(predicate).select(id).distinct();
-    ((AbstractJPAQuery<?, ?>) idQuery).setHint(QueryHints.PASS_DISTINCT_THROUGH, false);
+    var idQuery = createQuery(predicate).select(id);
     return querydsl.applyPagination(pageable, idQuery).fetch();
   }
 
@@ -129,24 +120,21 @@ public List<T> findAll(Predicate predicate, Sort sort, Integer limit, EntityGrap
         
         var idQuery = createQuery(predicate)
             .select(idPath.get())
-            .distinct()
             .limit(limit);
         
-        ((AbstractJPAQuery<?, ?>) idQuery).setHint(QueryHints.PASS_DISTINCT_THROUGH, false);
+       
         query = (JPQLQuery<T>) createQuery(idPath.get().in(idQuery));
       } else {
         query.limit(limit);
       }
     }
-    
-    ((AbstractJPAQuery<?, ?>) query).setHint(QueryHints.PASS_DISTINCT_THROUGH, false);
+
     if (graph != null) {
-      ((AbstractJPAQuery<?, ?>) query).setHint(GraphSemantic.FETCH.getJpaHintName(), graph);
+      ((AbstractJPAQuery<?, ?>) query).setHint(GraphSemantic.FETCH.getJakartaHintName(), graph);
     }
     
     return sort != null && sort.isSorted()
-        ? querydsl.applySorting(sort, query).distinct().fetch()
+        ? querydsl.applySorting(sort, query).fetch()
         : query.fetch();
   }
-  
 }
diff --git a/src/main/java/app/milo/server/core/security/ApplicationSecurity.java b/src/main/java/app/milo/server/core/security/ApplicationSecurity.java
index 30d8c2ac..ce895167 100644
--- a/src/main/java/app/milo/server/core/security/ApplicationSecurity.java
+++ b/src/main/java/app/milo/server/core/security/ApplicationSecurity.java
@@ -4,16 +4,18 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.ProviderManager;
+import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.config.core.GrantedAuthorityDefaults;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -21,47 +23,64 @@
 import app.milo.server.core.security.services.AuthenticationService;
 
 @Configuration
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class ApplicationSecurity extends WebSecurityConfigurerAdapter {
+@EnableWebSecurity
+@EnableMethodSecurity
+public class ApplicationSecurity  {
 
   private final AuthenticationService authService;
-
-  private final BCryptPasswordEncoder bcryptPasswordEncoder;
   
+  private final BCryptPasswordEncoder encoder;
+
   private final UserDetailsService userDetailsService;
 
   public ApplicationSecurity(
       AuthenticationService authService,
       BCryptPasswordEncoder encoder,
       UserDetailsService userDetailsService) {
+    
     this.authService = authService;
-    this.bcryptPasswordEncoder = encoder;
     this.userDetailsService = userDetailsService;
+    this.encoder = encoder;
   }
-
-  @Override
-  protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-    auth.userDetailsService(this.userDetailsService).passwordEncoder(bcryptPasswordEncoder);
+  
+  @Bean
+  public AuthenticationProvider authenticationProvider() {
+      DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
+      authProvider.setUserDetailsService(userDetailsService);
+      authProvider.setPasswordEncoder(encoder);
+      return authProvider;
+  }
+  
+  @Bean
+  public GrantedAuthorityDefaults grantedAuthorityDefaults() {
+    return new GrantedAuthorityDefaults("");
   }
 
-  @Override
-  protected void configure(HttpSecurity http) throws Exception {
+  @Bean
+  protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
     http
-    .cors().and()
-    .csrf().disable()
-    .headers().frameOptions().sameOrigin()
-      .and()
+    .csrf(AbstractHttpConfigurer::disable)
+    .cors(corsCustomizer -> corsCustomizer.configurationSource(corsConfigurationSource()))
     .addFilter(jwtAuthorizationFilter())
-    .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+    .headers(headers -> headers.frameOptions(frameOptionsConfig -> frameOptionsConfig.sameOrigin()))
+    .sessionManagement(sessionManagementCustomizer -> sessionManagementCustomizer
+        .sessionCreationPolicy(SessionCreationPolicy.STATELESS));
+    return http.build();
   }
   
   @Bean
-  public GrantedAuthorityDefaults grantedAuthorityDefaults() {
-    return new GrantedAuthorityDefaults("");
+  public AuthenticationManager authenticationManager(AuthenticationConfiguration config)
+          throws Exception {
+    return config.getAuthenticationManager();
+  } 
+  
+  @Bean
+  public JwtAuthorizationFilter jwtAuthorizationFilter() throws Exception {
+    return new JwtAuthorizationFilter(authService);
   }
+  
 
-  @Bean
-  @Profile(value = { "development", "local", "test" })
+  @Profile(value = { "development", "local", "test" })  
   public CorsConfigurationSource corsConfigurationSource() {
     CorsConfiguration config = new CorsConfiguration();
 
@@ -74,16 +93,4 @@ public CorsConfigurationSource corsConfigurationSource() {
     source.registerCorsConfiguration("/**", config);
     return source;
   }
-
-  public JwtAuthorizationFilter jwtAuthorizationFilter() throws Exception {
-    return new JwtAuthorizationFilter(authService);
-  }
-  
-  @Bean
-  public AuthenticationManager getAuthManager() {
-    var provider = new DaoAuthenticationProvider();
-    provider.setUserDetailsService(userDetailsService);
-    provider.setPasswordEncoder(bcryptPasswordEncoder);
-    return new ProviderManager(provider);
-  }
 }
diff --git a/src/main/java/app/milo/server/core/security/components/role/application/PrivilegeApplicationEntity.java b/src/main/java/app/milo/server/core/security/components/role/application/PrivilegeApplicationEntity.java
index 23338e70..eb61a2df 100644
--- a/src/main/java/app/milo/server/core/security/components/role/application/PrivilegeApplicationEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/role/application/PrivilegeApplicationEntity.java
@@ -1,13 +1,13 @@
 package app.milo.server.core.security.components.role.application;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.core.security.components.role.application.translation.PrivilegeApplicationTranslatableEntity;
diff --git a/src/main/java/app/milo/server/core/security/components/role/application/translation/PrivilegeApplicationTranslatableEntity.java b/src/main/java/app/milo/server/core/security/components/role/application/translation/PrivilegeApplicationTranslatableEntity.java
index 359004b5..0bd92e29 100644
--- a/src/main/java/app/milo/server/core/security/components/role/application/translation/PrivilegeApplicationTranslatableEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/role/application/translation/PrivilegeApplicationTranslatableEntity.java
@@ -1,9 +1,9 @@
 package app.milo.server.core.security.components.role.application.translation;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.i18n.components.language.LanguageEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.core.security.components.role.application.PrivilegeApplicationEntity;
diff --git a/src/main/java/app/milo/server/core/security/components/role/base/RoleEntity.java b/src/main/java/app/milo/server/core/security/components/role/base/RoleEntity.java
index 42d741b0..5254309e 100644
--- a/src/main/java/app/milo/server/core/security/components/role/base/RoleEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/role/base/RoleEntity.java
@@ -3,15 +3,15 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import org.hibernate.annotations.CollectionId;
 import org.hibernate.annotations.Type;
 import app.milo.server.core.base.BaseEntity;
@@ -45,13 +45,13 @@ public class RoleEntity extends BaseEntity {
   @JoinTable(name = "user_roles", joinColumns = @JoinColumn(name = "role_id"),
       inverseJoinColumns = @JoinColumn(name = "user_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "role_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
+  
   private List<UserEntity> users = new ArrayList<>();
   
   @ManyToMany(fetch = FetchType.LAZY)
   @JoinTable(name = "role_role_privileges", joinColumns = @JoinColumn(name = "role_id"),
       inverseJoinColumns = @JoinColumn(name = "role_privilege_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"role_id", "role_privilege_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
+  
   private List<RolePrivilegeEntity> privileges = new ArrayList<>();
 }
diff --git a/src/main/java/app/milo/server/core/security/components/role/base/translation/RoleTranslatableEntity.java b/src/main/java/app/milo/server/core/security/components/role/base/translation/RoleTranslatableEntity.java
index 4404e56d..cf8fdf3e 100644
--- a/src/main/java/app/milo/server/core/security/components/role/base/translation/RoleTranslatableEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/role/base/translation/RoleTranslatableEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.core.security.components.role.base.translation;
 
-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.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.i18n.components.language.LanguageEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.core.security.components.role.base.RoleEntity;
diff --git a/src/main/java/app/milo/server/core/security/components/role/privilege/RolePrivilegeEntity.java b/src/main/java/app/milo/server/core/security/components/role/privilege/RolePrivilegeEntity.java
index 47c4bf39..dd5fa9b6 100644
--- a/src/main/java/app/milo/server/core/security/components/role/privilege/RolePrivilegeEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/role/privilege/RolePrivilegeEntity.java
@@ -3,15 +3,15 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import org.hibernate.annotations.CollectionId;
 import org.hibernate.annotations.Type;
 import app.milo.server.core.base.BaseEntity;
@@ -54,7 +54,7 @@ public class RolePrivilegeEntity extends BaseEntity {
   @JoinTable(name = "role_role_privileges", joinColumns = @JoinColumn(name = "role_privilege_id"),
       inverseJoinColumns = @JoinColumn(name = "role_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"role_id", "role_privilege_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
+  
   private List<RoleEntity> roles = new ArrayList<>();
   
 }
diff --git a/src/main/java/app/milo/server/core/security/components/role/privilege/translation/RolePrivilegeTranslatableEntity.java b/src/main/java/app/milo/server/core/security/components/role/privilege/translation/RolePrivilegeTranslatableEntity.java
index 879d642f..ab3904c0 100644
--- a/src/main/java/app/milo/server/core/security/components/role/privilege/translation/RolePrivilegeTranslatableEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/role/privilege/translation/RolePrivilegeTranslatableEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.core.security.components.role.privilege.translation;
 
-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.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.i18n.components.language.LanguageEntity;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.core.security.components.role.privilege.RolePrivilegeEntity;
diff --git a/src/main/java/app/milo/server/core/security/components/user/UserEntity.java b/src/main/java/app/milo/server/core/security/components/user/UserEntity.java
index 1f282256..6b4e9f83 100644
--- a/src/main/java/app/milo/server/core/security/components/user/UserEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/user/UserEntity.java
@@ -4,20 +4,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.UniqueConstraint;
-import org.hibernate.annotations.CollectionId;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Type;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.components.language.LanguageEntity;
 import app.milo.server.core.messaging.notifications.base.NotificationEntity;
@@ -26,6 +12,17 @@
 import app.milo.server.core.security.components.role.base.RoleEntity;
 import app.milo.server.core.security.components.user.emailVerification.VerificationEntity;
 import app.milo.server.core.security.components.user.passwordReset.PasswordResetEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -38,7 +35,6 @@
 @AllArgsConstructor
 @Entity
 @Table(name = "users")
-@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
 public class UserEntity extends BaseEntity {
 
   private static final long serialVersionUID = 1L;
@@ -75,7 +71,6 @@ public class UserEntity extends BaseEntity {
   @JoinTable(name = "user_roles", joinColumns = @JoinColumn(name = "user_id"),
       inverseJoinColumns = @JoinColumn(name = "role_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "role_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<RoleEntity> roles = new ArrayList<>();
 
   @OneToMany(fetch = FetchType.LAZY, mappedBy = "user")
diff --git a/src/main/java/app/milo/server/core/security/components/user/emailVerification/VerificationEntity.java b/src/main/java/app/milo/server/core/security/components/user/emailVerification/VerificationEntity.java
index 1b148364..62a985b3 100644
--- a/src/main/java/app/milo/server/core/security/components/user/emailVerification/VerificationEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/user/emailVerification/VerificationEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.core.security.components.user.emailVerification;
 
-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.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.security.components.user.UserEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/core/security/components/user/passwordReset/PasswordResetEntity.java b/src/main/java/app/milo/server/core/security/components/user/passwordReset/PasswordResetEntity.java
index fd593637..8f48d5f5 100644
--- a/src/main/java/app/milo/server/core/security/components/user/passwordReset/PasswordResetEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/user/passwordReset/PasswordResetEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.core.security.components.user.passwordReset;
 
-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.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.security.components.user.UserEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/core/security/components/userDeletion/base/UserDeletionEntity.java b/src/main/java/app/milo/server/core/security/components/userDeletion/base/UserDeletionEntity.java
index 41f9da94..6372c21d 100644
--- a/src/main/java/app/milo/server/core/security/components/userDeletion/base/UserDeletionEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/userDeletion/base/UserDeletionEntity.java
@@ -3,22 +3,18 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import org.hibernate.annotations.CollectionId;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Type;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.core.security.components.userDeletion.base.translations.UserDeletionTranslatableEntity;
 import app.milo.server.core.security.components.userDeletion.type.UserDeletionTypeEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -31,7 +27,6 @@
 @AllArgsConstructor
 @Entity
 @Table(name = "user_deletions")
-@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
 public class UserDeletionEntity extends BaseEntity {
 
   private static final long serialVersionUID = 1L;
@@ -46,7 +41,6 @@ public class UserDeletionEntity extends BaseEntity {
   @JoinTable(name = "user_deletion_user_deletion_types", joinColumns = @JoinColumn(name = "user_deletion_id"),
       inverseJoinColumns = @JoinColumn(name = "user_deletion_type_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_deletion_id", "user_deletion_type_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<UserDeletionTypeEntity> types = new ArrayList<>();
 
 }
diff --git a/src/main/java/app/milo/server/core/security/components/userDeletion/base/translations/UserDeletionTranslatableEntity.java b/src/main/java/app/milo/server/core/security/components/userDeletion/base/translations/UserDeletionTranslatableEntity.java
index 1cb85d56..cdfa2d3d 100644
--- a/src/main/java/app/milo/server/core/security/components/userDeletion/base/translations/UserDeletionTranslatableEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/userDeletion/base/translations/UserDeletionTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.core.security.components.userDeletion.base.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.core.security.components.userDeletion.base.UserDeletionEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/core/security/components/userDeletion/type/UserDeletionTypeEntity.java b/src/main/java/app/milo/server/core/security/components/userDeletion/type/UserDeletionTypeEntity.java
index d652b5bf..c127a032 100644
--- a/src/main/java/app/milo/server/core/security/components/userDeletion/type/UserDeletionTypeEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/userDeletion/type/UserDeletionTypeEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.core.security.components.userDeletion.type;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
diff --git a/src/main/java/app/milo/server/core/security/components/userDeletion/type/translations/UserDeletionTypeTranslatableEntity.java b/src/main/java/app/milo/server/core/security/components/userDeletion/type/translations/UserDeletionTypeTranslatableEntity.java
index 72016e23..22fe8b64 100644
--- a/src/main/java/app/milo/server/core/security/components/userDeletion/type/translations/UserDeletionTypeTranslatableEntity.java
+++ b/src/main/java/app/milo/server/core/security/components/userDeletion/type/translations/UserDeletionTypeTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.core.security.components.userDeletion.type.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.core.security.components.userDeletion.type.UserDeletionTypeEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/core/security/filter/JwtAuthorizationFilter.java b/src/main/java/app/milo/server/core/security/filter/JwtAuthorizationFilter.java
index fe87d717..98def3cc 100644
--- a/src/main/java/app/milo/server/core/security/filter/JwtAuthorizationFilter.java
+++ b/src/main/java/app/milo/server/core/security/filter/JwtAuthorizationFilter.java
@@ -2,10 +2,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
diff --git a/src/main/java/app/milo/server/core/security/services/AuthenticationService.java b/src/main/java/app/milo/server/core/security/services/AuthenticationService.java
index 7ab600c1..7bf35ded 100644
--- a/src/main/java/app/milo/server/core/security/services/AuthenticationService.java
+++ b/src/main/java/app/milo/server/core/security/services/AuthenticationService.java
@@ -3,7 +3,7 @@
 import java.util.Collections;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.context.annotation.Lazy;
 import org.springframework.security.authentication.AuthenticationManager;
diff --git a/src/main/java/app/milo/server/core/utils/PersistenceUtils.java b/src/main/java/app/milo/server/core/utils/PersistenceUtils.java
index 32fa0335..0fe0ce04 100644
--- a/src/main/java/app/milo/server/core/utils/PersistenceUtils.java
+++ b/src/main/java/app/milo/server/core/utils/PersistenceUtils.java
@@ -8,13 +8,13 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Column;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.persistence.UniqueConstraint;
 
 import org.hibernate.Hibernate;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/core/visit/VisitInterceptor.java b/src/main/java/app/milo/server/core/visit/VisitInterceptor.java
index db29e668..e5ecbf6e 100644
--- a/src/main/java/app/milo/server/core/visit/VisitInterceptor.java
+++ b/src/main/java/app/milo/server/core/visit/VisitInterceptor.java
@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
diff --git a/src/main/java/app/milo/server/core/visit/visitable/VisitableEntity.java b/src/main/java/app/milo/server/core/visit/visitable/VisitableEntity.java
index 9c69fdd9..2c6e9e89 100644
--- a/src/main/java/app/milo/server/core/visit/visitable/VisitableEntity.java
+++ b/src/main/java/app/milo/server/core/visit/visitable/VisitableEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.core.visit.visitable;
 
-import javax.persistence.Column;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Column;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MappedSuperclass;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/core/visit/visitable/VisitableService.java b/src/main/java/app/milo/server/core/visit/visitable/VisitableService.java
index fba597db..c7bf9881 100644
--- a/src/main/java/app/milo/server/core/visit/visitable/VisitableService.java
+++ b/src/main/java/app/milo/server/core/visit/visitable/VisitableService.java
@@ -3,10 +3,7 @@
 import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.UUID;
-
 import javax.naming.ServiceUnavailableException;
-import javax.servlet.http.HttpServletRequest;
-
 import org.hibernate.Hibernate;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -18,6 +15,7 @@
 import app.milo.server.core.visit.VisitHelper;
 import app.milo.server.core.visit.visitor.VisitorEntity;
 import app.milo.server.core.visit.visitor.VisitorService;
+import jakarta.servlet.http.HttpServletRequest;
 
 //TODO: Figure out how to unify DataService approach with the current save and repository approach
 @Service
diff --git a/src/main/java/app/milo/server/core/visit/visitor/VisitorEntity.java b/src/main/java/app/milo/server/core/visit/visitor/VisitorEntity.java
index 517923f9..8855b361 100644
--- a/src/main/java/app/milo/server/core/visit/visitor/VisitorEntity.java
+++ b/src/main/java/app/milo/server/core/visit/visitor/VisitorEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.core.visit.visitor;
 
-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 app.milo.server.core.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/app/milo/server/features/article/components/base/ArticleEntity.java b/src/main/java/app/milo/server/features/article/components/base/ArticleEntity.java
index f03cd2c2..2d4c6d01 100644
--- a/src/main/java/app/milo/server/features/article/components/base/ArticleEntity.java
+++ b/src/main/java/app/milo/server/features/article/components/base/ArticleEntity.java
@@ -3,17 +3,17 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.persistence.UniqueConstraint;
 import org.hibernate.annotations.CollectionId;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
@@ -101,7 +101,7 @@ public class ArticleEntity extends BaseEntity {
   @JoinTable(name = "favorite_articles", joinColumns = @JoinColumn(name = "article_id"),
       inverseJoinColumns = @JoinColumn(name = "user_context_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "article_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
+  
   private List<UserContextEntity> favoritingUsers = new ArrayList<>();
   
 }
diff --git a/src/main/java/app/milo/server/features/article/components/base/translations/ArticleTranslatableEntity.java b/src/main/java/app/milo/server/features/article/components/base/translations/ArticleTranslatableEntity.java
index aa848ef4..50af84dc 100644
--- a/src/main/java/app/milo/server/features/article/components/base/translations/ArticleTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/article/components/base/translations/ArticleTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.article.components.base.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.article.components.base.ArticleEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/article/components/base/visitors/ArticleVisitorEntity.java b/src/main/java/app/milo/server/features/article/components/base/visitors/ArticleVisitorEntity.java
index 655e4b86..ad8e0732 100644
--- a/src/main/java/app/milo/server/features/article/components/base/visitors/ArticleVisitorEntity.java
+++ b/src/main/java/app/milo/server/features/article/components/base/visitors/ArticleVisitorEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.features.article.components.base.visitors;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.core.visit.visitable.VisitableEntity;
 import app.milo.server.features.article.components.base.ArticleEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/article/components/category/ArticleCategoryEntity.java b/src/main/java/app/milo/server/features/article/components/category/ArticleCategoryEntity.java
index b19f88ec..6430b30a 100644
--- a/src/main/java/app/milo/server/features/article/components/category/ArticleCategoryEntity.java
+++ b/src/main/java/app/milo/server/features/article/components/category/ArticleCategoryEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.article.components.category;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.features.article.components.base.ArticleEntity;
diff --git a/src/main/java/app/milo/server/features/article/components/category/translations/ArticleCategoryTranslatableEntity.java b/src/main/java/app/milo/server/features/article/components/category/translations/ArticleCategoryTranslatableEntity.java
index 8a029a3b..d107ee71 100644
--- a/src/main/java/app/milo/server/features/article/components/category/translations/ArticleCategoryTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/article/components/category/translations/ArticleCategoryTranslatableEntity.java
@@ -1,9 +1,9 @@
 package app.milo.server.features.article.components.category.translations;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.article.components.category.ArticleCategoryEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/article/components/comment/ArticleCommentEntity.java b/src/main/java/app/milo/server/features/article/components/comment/ArticleCommentEntity.java
index 0ddcd741..5c198f70 100644
--- a/src/main/java/app/milo/server/features/article/components/comment/ArticleCommentEntity.java
+++ b/src/main/java/app/milo/server/features/article/components/comment/ArticleCommentEntity.java
@@ -1,13 +1,13 @@
 package app.milo.server.features.article.components.comment;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/features/article/components/comment/translations/ArticleCommentTranslatableEntity.java b/src/main/java/app/milo/server/features/article/components/comment/translations/ArticleCommentTranslatableEntity.java
index e19ce446..b7348fad 100644
--- a/src/main/java/app/milo/server/features/article/components/comment/translations/ArticleCommentTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/article/components/comment/translations/ArticleCommentTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.article.components.comment.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.article.components.comment.ArticleCommentEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/article/components/media/ArticleMediaEntity.java b/src/main/java/app/milo/server/features/article/components/media/ArticleMediaEntity.java
index ec896173..438337bf 100644
--- a/src/main/java/app/milo/server/features/article/components/media/ArticleMediaEntity.java
+++ b/src/main/java/app/milo/server/features/article/components/media/ArticleMediaEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.article.components.media;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
 import app.milo.server.features.article.components.base.ArticleEntity;
diff --git a/src/main/java/app/milo/server/features/article/components/publicAuthor/ArticlePublicAuthorEntity.java b/src/main/java/app/milo/server/features/article/components/publicAuthor/ArticlePublicAuthorEntity.java
index 5eca6cba..34fc61d9 100644
--- a/src/main/java/app/milo/server/features/article/components/publicAuthor/ArticlePublicAuthorEntity.java
+++ b/src/main/java/app/milo/server/features/article/components/publicAuthor/ArticlePublicAuthorEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.article.components.publicAuthor;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.features.article.components.base.ArticleEntity;
diff --git a/src/main/java/app/milo/server/features/article/components/rating/ArticleRatingEntity.java b/src/main/java/app/milo/server/features/article/components/rating/ArticleRatingEntity.java
index c0e1b7a6..af8a2bc2 100644
--- a/src/main/java/app/milo/server/features/article/components/rating/ArticleRatingEntity.java
+++ b/src/main/java/app/milo/server/features/article/components/rating/ArticleRatingEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.article.components.rating;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.base.analytics.rating.RatableEntity;
 import app.milo.server.features.article.components.base.ArticleEntity;
 import lombok.Getter;
diff --git a/src/main/java/app/milo/server/features/contest/base/ContestEntity.java b/src/main/java/app/milo/server/features/contest/base/ContestEntity.java
index d3796eb8..a3db5eed 100644
--- a/src/main/java/app/milo/server/features/contest/base/ContestEntity.java
+++ b/src/main/java/app/milo/server/features/contest/base/ContestEntity.java
@@ -2,13 +2,13 @@
 
 import java.time.OffsetDateTime;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.contact.ContactEntity;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
diff --git a/src/main/java/app/milo/server/features/contest/base/media/ContestMediaEntity.java b/src/main/java/app/milo/server/features/contest/base/media/ContestMediaEntity.java
index 6e1c67fa..de42ad3f 100644
--- a/src/main/java/app/milo/server/features/contest/base/media/ContestMediaEntity.java
+++ b/src/main/java/app/milo/server/features/contest/base/media/ContestMediaEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.contest.base.media;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
 import app.milo.server.features.contest.base.ContestEntity;
diff --git a/src/main/java/app/milo/server/features/contest/base/translations/ContestTranslatableEntity.java b/src/main/java/app/milo/server/features/contest/base/translations/ContestTranslatableEntity.java
index 21a23616..37b53ae5 100644
--- a/src/main/java/app/milo/server/features/contest/base/translations/ContestTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/contest/base/translations/ContestTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.contest.base.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.contest.base.ContestEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/contest/comment/ContestCommentEntity.java b/src/main/java/app/milo/server/features/contest/comment/ContestCommentEntity.java
index aa8aa2b9..77e55ada 100644
--- a/src/main/java/app/milo/server/features/contest/comment/ContestCommentEntity.java
+++ b/src/main/java/app/milo/server/features/contest/comment/ContestCommentEntity.java
@@ -1,12 +1,12 @@
 package app.milo.server.features.contest.comment;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/features/contest/comment/translations/ContestCommentTranslatableEntity.java b/src/main/java/app/milo/server/features/contest/comment/translations/ContestCommentTranslatableEntity.java
index 00ff7042..1ec3c966 100644
--- a/src/main/java/app/milo/server/features/contest/comment/translations/ContestCommentTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/contest/comment/translations/ContestCommentTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.contest.comment.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.contest.comment.ContestCommentEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/contest/participation/ContestParticipationEntity.java b/src/main/java/app/milo/server/features/contest/participation/ContestParticipationEntity.java
index b4f4726a..67250361 100644
--- a/src/main/java/app/milo/server/features/contest/participation/ContestParticipationEntity.java
+++ b/src/main/java/app/milo/server/features/contest/participation/ContestParticipationEntity.java
@@ -3,12 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.Formula;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.userContext.base.UserContextEntity;
diff --git a/src/main/java/app/milo/server/features/contest/participation/media/ContestParticipationMediaEntity.java b/src/main/java/app/milo/server/features/contest/participation/media/ContestParticipationMediaEntity.java
index 6f31c403..ace51be0 100644
--- a/src/main/java/app/milo/server/features/contest/participation/media/ContestParticipationMediaEntity.java
+++ b/src/main/java/app/milo/server/features/contest/participation/media/ContestParticipationMediaEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.contest.participation.media;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
 import app.milo.server.features.contest.participation.ContestParticipationEntity;
diff --git a/src/main/java/app/milo/server/features/contest/participation/translations/ContestParticipationTranslatableEntity.java b/src/main/java/app/milo/server/features/contest/participation/translations/ContestParticipationTranslatableEntity.java
index 23b4145e..8e177b01 100644
--- a/src/main/java/app/milo/server/features/contest/participation/translations/ContestParticipationTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/contest/participation/translations/ContestParticipationTranslatableEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.features.contest.participation.translations;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.contest.participation.ContestParticipationEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/contest/type/ContestTypeEntity.java b/src/main/java/app/milo/server/features/contest/type/ContestTypeEntity.java
index 6a4240d0..27075b81 100644
--- a/src/main/java/app/milo/server/features/contest/type/ContestTypeEntity.java
+++ b/src/main/java/app/milo/server/features/contest/type/ContestTypeEntity.java
@@ -1,16 +1,15 @@
 package app.milo.server.features.contest.type;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.features.contest.base.ContestEntity;
 import app.milo.server.features.contest.type.translations.ContestTypeTranslatableEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -23,7 +22,6 @@
 @AllArgsConstructor
 @Entity
 @Table(name = "contest_types")
-@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
 public class ContestTypeEntity extends BaseEntity {
 
   private static final long serialVersionUID = 1L;
diff --git a/src/main/java/app/milo/server/features/contest/type/translations/ContestTypeTranslatableEntity.java b/src/main/java/app/milo/server/features/contest/type/translations/ContestTypeTranslatableEntity.java
index a917502d..28bef903 100644
--- a/src/main/java/app/milo/server/features/contest/type/translations/ContestTypeTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/contest/type/translations/ContestTypeTranslatableEntity.java
@@ -1,9 +1,10 @@
 package app.milo.server.features.contest.type.translations;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
+import app.milo.server.features.contest.type.ContestTypeEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -16,7 +17,7 @@
 @AllArgsConstructor
 @Entity
 @Table(name = "contest_type_translatables")
-public class ContestTypeTranslatableEntity extends TranslatableEntity<ContestTypeTranslatableEntity> {
+public class ContestTypeTranslatableEntity extends TranslatableEntity<ContestTypeEntity> {
 
   private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/app/milo/server/features/contest/vote/ContestVoteEntity.java b/src/main/java/app/milo/server/features/contest/vote/ContestVoteEntity.java
index 6375301b..0beeedc8 100644
--- a/src/main/java/app/milo/server/features/contest/vote/ContestVoteEntity.java
+++ b/src/main/java/app/milo/server/features/contest/vote/ContestVoteEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.contest.vote;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/features/deal/components/base/DealEntity.java b/src/main/java/app/milo/server/features/deal/components/base/DealEntity.java
index 86735c1d..afbc740b 100644
--- a/src/main/java/app/milo/server/features/deal/components/base/DealEntity.java
+++ b/src/main/java/app/milo/server/features/deal/components/base/DealEntity.java
@@ -3,16 +3,16 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import org.hibernate.annotations.CollectionId;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
@@ -98,6 +98,6 @@ public class DealEntity extends BaseEntity {
   @JoinTable(name = "favorite_deals", joinColumns = @JoinColumn(name = "deal_id"),
       inverseJoinColumns = @JoinColumn(name = "user_context_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "deal_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
+  
   private List<UserContextEntity> favoritingUsers = new ArrayList<>();
 }
diff --git a/src/main/java/app/milo/server/features/deal/components/base/media/DealMediaEntity.java b/src/main/java/app/milo/server/features/deal/components/base/media/DealMediaEntity.java
index 14258079..cb718b71 100644
--- a/src/main/java/app/milo/server/features/deal/components/base/media/DealMediaEntity.java
+++ b/src/main/java/app/milo/server/features/deal/components/base/media/DealMediaEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.deal.components.base.media;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
 import app.milo.server.features.deal.components.base.DealEntity;
diff --git a/src/main/java/app/milo/server/features/deal/components/base/translations/DealTranslatableEntity.java b/src/main/java/app/milo/server/features/deal/components/base/translations/DealTranslatableEntity.java
index 3a7e6003..373190e4 100644
--- a/src/main/java/app/milo/server/features/deal/components/base/translations/DealTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/deal/components/base/translations/DealTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.deal.components.base.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.deal.components.base.DealEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/deal/components/base/visitors/DealVisitorEntity.java b/src/main/java/app/milo/server/features/deal/components/base/visitors/DealVisitorEntity.java
index d87323f0..17eeea04 100644
--- a/src/main/java/app/milo/server/features/deal/components/base/visitors/DealVisitorEntity.java
+++ b/src/main/java/app/milo/server/features/deal/components/base/visitors/DealVisitorEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.features.deal.components.base.visitors;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.core.visit.visitable.VisitableEntity;
 import app.milo.server.features.deal.components.base.DealEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/deal/components/category/DealCategoryEntity.java b/src/main/java/app/milo/server/features/deal/components/category/DealCategoryEntity.java
index 8cc07c00..1886157f 100644
--- a/src/main/java/app/milo/server/features/deal/components/category/DealCategoryEntity.java
+++ b/src/main/java/app/milo/server/features/deal/components/category/DealCategoryEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.deal.components.category;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.features.deal.components.base.DealEntity;
diff --git a/src/main/java/app/milo/server/features/deal/components/category/translations/DealCategoryTranslatableEntity.java b/src/main/java/app/milo/server/features/deal/components/category/translations/DealCategoryTranslatableEntity.java
index b04664d6..ab286940 100644
--- a/src/main/java/app/milo/server/features/deal/components/category/translations/DealCategoryTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/deal/components/category/translations/DealCategoryTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.deal.components.category.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.deal.components.category.DealCategoryEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/event/attendee/EventAttendeeEntity.java b/src/main/java/app/milo/server/features/event/attendee/EventAttendeeEntity.java
index d0535e20..8c2166bb 100644
--- a/src/main/java/app/milo/server/features/event/attendee/EventAttendeeEntity.java
+++ b/src/main/java/app/milo/server/features/event/attendee/EventAttendeeEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.event.attendee;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.features.event.attendeeConfiguration.EventAttendeeConfigurationEntity;
diff --git a/src/main/java/app/milo/server/features/event/attendeeConfiguration/EventAttendeeConfigurationEntity.java b/src/main/java/app/milo/server/features/event/attendeeConfiguration/EventAttendeeConfigurationEntity.java
index 0633612e..b64ac8de 100644
--- a/src/main/java/app/milo/server/features/event/attendeeConfiguration/EventAttendeeConfigurationEntity.java
+++ b/src/main/java/app/milo/server/features/event/attendeeConfiguration/EventAttendeeConfigurationEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.event.attendeeConfiguration;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.features.event.attendee.EventAttendeeEntity;
 import app.milo.server.features.event.base.EventEntity;
diff --git a/src/main/java/app/milo/server/features/event/base/EventEntity.java b/src/main/java/app/milo/server/features/event/base/EventEntity.java
index e210fe28..ebbb6e9e 100644
--- a/src/main/java/app/milo/server/features/event/base/EventEntity.java
+++ b/src/main/java/app/milo/server/features/event/base/EventEntity.java
@@ -3,19 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import org.hibernate.annotations.CollectionId;
 import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Type;
 import app.milo.server.base.address.base.AddressEntity;
 import app.milo.server.base.contact.ContactEntity;
 import app.milo.server.base.userContext.base.UserContextEntity;
@@ -33,6 +21,16 @@
 import app.milo.server.features.event.schedule.EventScheduleEntity;
 import app.milo.server.features.event.targetGroup.EventTargetGroupEntity;
 import app.milo.server.features.organisation.base.OrganisationEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -115,13 +113,11 @@ public class EventEntity extends BaseEntity {
   @JoinTable(name = "event_event_target_groups", joinColumns = @JoinColumn(name = "event_id"),
       inverseJoinColumns = @JoinColumn(name = "target_group_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"event_id", "target_group_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<EventTargetGroupEntity> targetGroups = new ArrayList<>();
   
   @ManyToMany(fetch = FetchType.LAZY)
   @JoinTable(name = "favorite_events", joinColumns = @JoinColumn(name = "event_id"),
       inverseJoinColumns = @JoinColumn(name = "user_context_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "event_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
   private List<UserContextEntity> favoritingUsers = new ArrayList<>();
 }
diff --git a/src/main/java/app/milo/server/features/event/base/translations/EventTranslatableEntity.java b/src/main/java/app/milo/server/features/event/base/translations/EventTranslatableEntity.java
index e74d4dfa..9ef14c0a 100644
--- a/src/main/java/app/milo/server/features/event/base/translations/EventTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/event/base/translations/EventTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.event.base.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.event.base.EventEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/event/base/visitors/EventVisitorEntity.java b/src/main/java/app/milo/server/features/event/base/visitors/EventVisitorEntity.java
index f98c85c4..20fbed7d 100644
--- a/src/main/java/app/milo/server/features/event/base/visitors/EventVisitorEntity.java
+++ b/src/main/java/app/milo/server/features/event/base/visitors/EventVisitorEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.features.event.base.visitors;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.core.visit.visitable.VisitableEntity;
 import app.milo.server.features.event.base.EventEntity;
 import lombok.Getter;
diff --git a/src/main/java/app/milo/server/features/event/category/EventCategoryEntity.java b/src/main/java/app/milo/server/features/event/category/EventCategoryEntity.java
index 6b598cf9..8be4496d 100644
--- a/src/main/java/app/milo/server/features/event/category/EventCategoryEntity.java
+++ b/src/main/java/app/milo/server/features/event/category/EventCategoryEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.event.category;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.features.event.base.EventEntity;
diff --git a/src/main/java/app/milo/server/features/event/category/translations/EventCategoryTranslatableEntity.java b/src/main/java/app/milo/server/features/event/category/translations/EventCategoryTranslatableEntity.java
index 9256ef6a..727e788e 100644
--- a/src/main/java/app/milo/server/features/event/category/translations/EventCategoryTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/event/category/translations/EventCategoryTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.event.category.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.event.category.EventCategoryEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/event/comment/EventCommentEntity.java b/src/main/java/app/milo/server/features/event/comment/EventCommentEntity.java
index 89ad3235..a765a573 100644
--- a/src/main/java/app/milo/server/features/event/comment/EventCommentEntity.java
+++ b/src/main/java/app/milo/server/features/event/comment/EventCommentEntity.java
@@ -1,12 +1,12 @@
 package app.milo.server.features.event.comment;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/features/event/comment/translations/EventCommentTranslatableEntity.java b/src/main/java/app/milo/server/features/event/comment/translations/EventCommentTranslatableEntity.java
index 1dbbb2dc..d30a6742 100644
--- a/src/main/java/app/milo/server/features/event/comment/translations/EventCommentTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/event/comment/translations/EventCommentTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.event.comment.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.event.comment.EventCommentEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/event/media/EventMediaEntity.java b/src/main/java/app/milo/server/features/event/media/EventMediaEntity.java
index a8d8e306..6b07912c 100644
--- a/src/main/java/app/milo/server/features/event/media/EventMediaEntity.java
+++ b/src/main/java/app/milo/server/features/event/media/EventMediaEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.event.media;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
 import app.milo.server.features.event.base.EventEntity;
diff --git a/src/main/java/app/milo/server/features/event/rating/EventRatingEntity.java b/src/main/java/app/milo/server/features/event/rating/EventRatingEntity.java
index 3a90b3a5..44458275 100644
--- a/src/main/java/app/milo/server/features/event/rating/EventRatingEntity.java
+++ b/src/main/java/app/milo/server/features/event/rating/EventRatingEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.event.rating;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.base.analytics.rating.RatableEntity;
 import app.milo.server.features.event.base.EventEntity;
 import lombok.Getter;
diff --git a/src/main/java/app/milo/server/features/event/schedule/EventScheduleEntity.java b/src/main/java/app/milo/server/features/event/schedule/EventScheduleEntity.java
index 7f2bef65..80204a15 100644
--- a/src/main/java/app/milo/server/features/event/schedule/EventScheduleEntity.java
+++ b/src/main/java/app/milo/server/features/event/schedule/EventScheduleEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.event.schedule;
 
 import java.time.OffsetDateTime;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import com.querydsl.core.annotations.QueryInit;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.config.DefaultSort;
diff --git a/src/main/java/app/milo/server/features/event/targetGroup/EventTargetGroupEntity.java b/src/main/java/app/milo/server/features/event/targetGroup/EventTargetGroupEntity.java
index 4d777bc2..eb7337ea 100644
--- a/src/main/java/app/milo/server/features/event/targetGroup/EventTargetGroupEntity.java
+++ b/src/main/java/app/milo/server/features/event/targetGroup/EventTargetGroupEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.event.targetGroup;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.features.event.targetGroup.translations.EventTargetGroupTranslatableEntity;
diff --git a/src/main/java/app/milo/server/features/event/targetGroup/translations/EventTargetGroupTranslatableEntity.java b/src/main/java/app/milo/server/features/event/targetGroup/translations/EventTargetGroupTranslatableEntity.java
index 98929405..0c683794 100644
--- a/src/main/java/app/milo/server/features/event/targetGroup/translations/EventTargetGroupTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/event/targetGroup/translations/EventTargetGroupTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.event.targetGroup.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.event.targetGroup.EventTargetGroupEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/form/formTemplate/UserFormTemplateEntity.java b/src/main/java/app/milo/server/features/form/formTemplate/UserFormTemplateEntity.java
index f832bbf3..5dfc90c3 100644
--- a/src/main/java/app/milo/server/features/form/formTemplate/UserFormTemplateEntity.java
+++ b/src/main/java/app/milo/server/features/form/formTemplate/UserFormTemplateEntity.java
@@ -1,13 +1,13 @@
 package app.milo.server.features.form.formTemplate;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
diff --git a/src/main/java/app/milo/server/features/form/formTemplate/translations/UserFormTemplateTranslatableEntity.java b/src/main/java/app/milo/server/features/form/formTemplate/translations/UserFormTemplateTranslatableEntity.java
index a6161d01..919a65d6 100644
--- a/src/main/java/app/milo/server/features/form/formTemplate/translations/UserFormTemplateTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/form/formTemplate/translations/UserFormTemplateTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.form.formTemplate.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.form.formTemplate.UserFormTemplateEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/form/template/FormTemplateEntity.java b/src/main/java/app/milo/server/features/form/template/FormTemplateEntity.java
index 15ff1293..f670b1ad 100644
--- a/src/main/java/app/milo/server/features/form/template/FormTemplateEntity.java
+++ b/src/main/java/app/milo/server/features/form/template/FormTemplateEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.form.template;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.features.form.template.translations.FormTemplateTranslatableEntity;
diff --git a/src/main/java/app/milo/server/features/form/template/translations/FormTemplateTranslatableEntity.java b/src/main/java/app/milo/server/features/form/template/translations/FormTemplateTranslatableEntity.java
index 4247f7ee..2b8c5729 100644
--- a/src/main/java/app/milo/server/features/form/template/translations/FormTemplateTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/form/template/translations/FormTemplateTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.form.template.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.form.template.FormTemplateEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/form/templateType/FormTemplateTypeEntity.java b/src/main/java/app/milo/server/features/form/templateType/FormTemplateTypeEntity.java
index dd0a4382..7c83d58d 100644
--- a/src/main/java/app/milo/server/features/form/templateType/FormTemplateTypeEntity.java
+++ b/src/main/java/app/milo/server/features/form/templateType/FormTemplateTypeEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.form.templateType;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
diff --git a/src/main/java/app/milo/server/features/form/templateType/translations/FormTemplateTypeTranslatableEntity.java b/src/main/java/app/milo/server/features/form/templateType/translations/FormTemplateTypeTranslatableEntity.java
index 815ed406..e3ff4eb2 100644
--- a/src/main/java/app/milo/server/features/form/templateType/translations/FormTemplateTypeTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/form/templateType/translations/FormTemplateTypeTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.form.templateType.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.form.templateType.FormTemplateTypeEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/infoMedia/base/InfoMediaEntity.java b/src/main/java/app/milo/server/features/infoMedia/base/InfoMediaEntity.java
index 6ff3e921..bcc8862d 100644
--- a/src/main/java/app/milo/server/features/infoMedia/base/InfoMediaEntity.java
+++ b/src/main/java/app/milo/server/features/infoMedia/base/InfoMediaEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.infoMedia.base;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
diff --git a/src/main/java/app/milo/server/features/infoMedia/category/InfoMediaCategoryEntity.java b/src/main/java/app/milo/server/features/infoMedia/category/InfoMediaCategoryEntity.java
index 184d9df8..81139445 100644
--- a/src/main/java/app/milo/server/features/infoMedia/category/InfoMediaCategoryEntity.java
+++ b/src/main/java/app/milo/server/features/infoMedia/category/InfoMediaCategoryEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.infoMedia.category;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.features.infoMedia.base.InfoMediaEntity;
diff --git a/src/main/java/app/milo/server/features/infoMedia/category/translations/InfoMediaCategoryTranslatableEntity.java b/src/main/java/app/milo/server/features/infoMedia/category/translations/InfoMediaCategoryTranslatableEntity.java
index ee7ef26a..4e378471 100644
--- a/src/main/java/app/milo/server/features/infoMedia/category/translations/InfoMediaCategoryTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/infoMedia/category/translations/InfoMediaCategoryTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.infoMedia.category.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.infoMedia.category.InfoMediaCategoryEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/navigator/choice/NavigatorChoiceEntity.java b/src/main/java/app/milo/server/features/navigator/choice/NavigatorChoiceEntity.java
index 26b72f5d..239d5862 100644
--- a/src/main/java/app/milo/server/features/navigator/choice/NavigatorChoiceEntity.java
+++ b/src/main/java/app/milo/server/features/navigator/choice/NavigatorChoiceEntity.java
@@ -1,12 +1,12 @@
 package app.milo.server.features.navigator.choice;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.core.seo.annotations.SlugSource;
diff --git a/src/main/java/app/milo/server/features/navigator/choice/translations/NavigatorChoiceTranslatableEntity.java b/src/main/java/app/milo/server/features/navigator/choice/translations/NavigatorChoiceTranslatableEntity.java
index cb6e0684..76c6eb09 100644
--- a/src/main/java/app/milo/server/features/navigator/choice/translations/NavigatorChoiceTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/navigator/choice/translations/NavigatorChoiceTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.navigator.choice.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.navigator.choice.NavigatorChoiceEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/navigator/page/NavigatorPageEntity.java b/src/main/java/app/milo/server/features/navigator/page/NavigatorPageEntity.java
index 88055082..6bd3e6d8 100644
--- a/src/main/java/app/milo/server/features/navigator/page/NavigatorPageEntity.java
+++ b/src/main/java/app/milo/server/features/navigator/page/NavigatorPageEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.navigator.page;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.core.seo.annotations.SlugSource;
diff --git a/src/main/java/app/milo/server/features/navigator/page/translations/NavigatorPageTranslatableEntity.java b/src/main/java/app/milo/server/features/navigator/page/translations/NavigatorPageTranslatableEntity.java
index d0afdd7c..05613a7b 100644
--- a/src/main/java/app/milo/server/features/navigator/page/translations/NavigatorPageTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/navigator/page/translations/NavigatorPageTranslatableEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.navigator.page.translations;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
-import app.milo.server.features.navigator.choice.NavigatorChoiceEntity;
+import app.milo.server.features.navigator.page.NavigatorPageEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -21,7 +21,7 @@
 @AllArgsConstructor
 @Entity
 @Table(name = "navigator_page_translatables")
-public class NavigatorPageTranslatableEntity extends TranslatableEntity<NavigatorChoiceEntity> {
+public class NavigatorPageTranslatableEntity extends TranslatableEntity<NavigatorPageEntity> {
 
   private static final long serialVersionUID = 1L;
 
@@ -29,5 +29,4 @@ public class NavigatorPageTranslatableEntity extends TranslatableEntity<Navigato
   
   @Column(nullable = false)
   private String title;
-
 }
diff --git a/src/main/java/app/milo/server/features/navigator/resultLink/NavigatorResultLinkEntity.java b/src/main/java/app/milo/server/features/navigator/resultLink/NavigatorResultLinkEntity.java
index 1d46c8d5..3d04bfe0 100644
--- a/src/main/java/app/milo/server/features/navigator/resultLink/NavigatorResultLinkEntity.java
+++ b/src/main/java/app/milo/server/features/navigator/resultLink/NavigatorResultLinkEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.navigator.resultLink;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.features.navigator.page.NavigatorPageEntity;
diff --git a/src/main/java/app/milo/server/features/navigator/resultLink/translations/NavigatorResultLinkTranslatableEntity.java b/src/main/java/app/milo/server/features/navigator/resultLink/translations/NavigatorResultLinkTranslatableEntity.java
index 45b2355e..afb372c5 100644
--- a/src/main/java/app/milo/server/features/navigator/resultLink/translations/NavigatorResultLinkTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/navigator/resultLink/translations/NavigatorResultLinkTranslatableEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.features.navigator.resultLink.translations;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.navigator.resultLink.NavigatorResultLinkEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/organisation/base/OrganisationEntity.java b/src/main/java/app/milo/server/features/organisation/base/OrganisationEntity.java
index 1816932d..4ad83541 100644
--- a/src/main/java/app/milo/server/features/organisation/base/OrganisationEntity.java
+++ b/src/main/java/app/milo/server/features/organisation/base/OrganisationEntity.java
@@ -3,16 +3,16 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import org.hibernate.annotations.CollectionId;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
@@ -102,7 +102,7 @@ public class OrganisationEntity extends BaseEntity {
   @JoinTable(name = "favorite_organisations", joinColumns = @JoinColumn(name = "organisation_id"),
       inverseJoinColumns = @JoinColumn(name = "user_context_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "organisation_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
+  
   private List<UserContextEntity> favoritingUsers = new ArrayList<>();
   
 }
diff --git a/src/main/java/app/milo/server/features/organisation/base/translations/OrganisationTranslatableEntity.java b/src/main/java/app/milo/server/features/organisation/base/translations/OrganisationTranslatableEntity.java
index 9b431f64..bcb482e9 100644
--- a/src/main/java/app/milo/server/features/organisation/base/translations/OrganisationTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/organisation/base/translations/OrganisationTranslatableEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.features.organisation.base.translations;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.organisation.base.OrganisationEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/organisation/base/visitors/OrganisationVisitorEntity.java b/src/main/java/app/milo/server/features/organisation/base/visitors/OrganisationVisitorEntity.java
index f881fe6e..eae6d3fc 100644
--- a/src/main/java/app/milo/server/features/organisation/base/visitors/OrganisationVisitorEntity.java
+++ b/src/main/java/app/milo/server/features/organisation/base/visitors/OrganisationVisitorEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.features.organisation.base.visitors;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.core.visit.visitable.VisitableEntity;
 import app.milo.server.features.organisation.base.OrganisationEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/organisation/comment/OrganisationCommentEntity.java b/src/main/java/app/milo/server/features/organisation/comment/OrganisationCommentEntity.java
index 50d889de..d019a475 100644
--- a/src/main/java/app/milo/server/features/organisation/comment/OrganisationCommentEntity.java
+++ b/src/main/java/app/milo/server/features/organisation/comment/OrganisationCommentEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.organisation.comment;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
diff --git a/src/main/java/app/milo/server/features/organisation/comment/translations/OrganisationCommentTranslatableEntity.java b/src/main/java/app/milo/server/features/organisation/comment/translations/OrganisationCommentTranslatableEntity.java
index 38f9a61c..0f4ea9b4 100644
--- a/src/main/java/app/milo/server/features/organisation/comment/translations/OrganisationCommentTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/organisation/comment/translations/OrganisationCommentTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.organisation.comment.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.organisation.comment.OrganisationCommentEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/organisation/configuration/OrganisationConfigurationEntity.java b/src/main/java/app/milo/server/features/organisation/configuration/OrganisationConfigurationEntity.java
index 54c2acc3..5288d57f 100644
--- a/src/main/java/app/milo/server/features/organisation/configuration/OrganisationConfigurationEntity.java
+++ b/src/main/java/app/milo/server/features/organisation/configuration/OrganisationConfigurationEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.organisation.configuration;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.security.components.role.base.RoleEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/organisation/media/OrganisationMediaEntity.java b/src/main/java/app/milo/server/features/organisation/media/OrganisationMediaEntity.java
index c2565ab6..755bf31a 100644
--- a/src/main/java/app/milo/server/features/organisation/media/OrganisationMediaEntity.java
+++ b/src/main/java/app/milo/server/features/organisation/media/OrganisationMediaEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.organisation.media;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
 import app.milo.server.features.organisation.base.OrganisationEntity;
diff --git a/src/main/java/app/milo/server/features/organisation/member/OrganisationMemberEntity.java b/src/main/java/app/milo/server/features/organisation/member/OrganisationMemberEntity.java
index 67a407c9..e4a4a85b 100644
--- a/src/main/java/app/milo/server/features/organisation/member/OrganisationMemberEntity.java
+++ b/src/main/java/app/milo/server/features/organisation/member/OrganisationMemberEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.organisation.member;
 
-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.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/features/organisation/rating/OrganisationRatingEntity.java b/src/main/java/app/milo/server/features/organisation/rating/OrganisationRatingEntity.java
index 4d8dd102..0f3dc056 100644
--- a/src/main/java/app/milo/server/features/organisation/rating/OrganisationRatingEntity.java
+++ b/src/main/java/app/milo/server/features/organisation/rating/OrganisationRatingEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.organisation.rating;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.base.analytics.rating.RatableEntity;
 import app.milo.server.features.organisation.base.OrganisationEntity;
 import lombok.Getter;
diff --git a/src/main/java/app/milo/server/features/survey/answer/SurveyAnswerEntity.java b/src/main/java/app/milo/server/features/survey/answer/SurveyAnswerEntity.java
index e3e5276b..8f1265eb 100644
--- a/src/main/java/app/milo/server/features/survey/answer/SurveyAnswerEntity.java
+++ b/src/main/java/app/milo/server/features/survey/answer/SurveyAnswerEntity.java
@@ -3,25 +3,21 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import org.hibernate.annotations.CollectionId;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Type;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
 import app.milo.server.features.survey.answer.translations.SurveyAnswerTranslatableEntity;
 import app.milo.server.features.survey.question.SurveyQuestionEntity;
 import app.milo.server.features.survey.questionOption.SurveyQuestionOptionEntity;
 import app.milo.server.features.survey.result.SurveyResultEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -34,7 +30,6 @@
 @AllArgsConstructor
 @Entity
 @Table(name = "survey_answers")
-@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
 public class SurveyAnswerEntity extends BaseEntity {
 
   private static final long serialVersionUID = 1L;
@@ -54,7 +49,7 @@ public class SurveyAnswerEntity extends BaseEntity {
   @JoinTable(name = "answer_question_options", joinColumns = @JoinColumn(name = "answer_id"),
       inverseJoinColumns = @JoinColumn(name = "question_option_id"),
       uniqueConstraints = {@UniqueConstraint(columnNames = {"answer_id", "question_option_id"})})
-  @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID")
+  
   private List<SurveyQuestionOptionEntity> selectedOptions = new ArrayList<>();
 
   @OneToMany(mappedBy = "parent", fetch = FetchType.LAZY)
diff --git a/src/main/java/app/milo/server/features/survey/answer/translations/SurveyAnswerTranslatableEntity.java b/src/main/java/app/milo/server/features/survey/answer/translations/SurveyAnswerTranslatableEntity.java
index a960d8d9..fc5f493d 100644
--- a/src/main/java/app/milo/server/features/survey/answer/translations/SurveyAnswerTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/survey/answer/translations/SurveyAnswerTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.survey.answer.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.survey.answer.SurveyAnswerEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/survey/assignment/SurveyAssignmentEntity.java b/src/main/java/app/milo/server/features/survey/assignment/SurveyAssignmentEntity.java
index 5eac1a19..6c361a01 100644
--- a/src/main/java/app/milo/server/features/survey/assignment/SurveyAssignmentEntity.java
+++ b/src/main/java/app/milo/server/features/survey/assignment/SurveyAssignmentEntity.java
@@ -1,10 +1,10 @@
 package app.milo.server.features.survey.assignment;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.features.survey.base.SurveyEntity;
diff --git a/src/main/java/app/milo/server/features/survey/base/SurveyEntity.java b/src/main/java/app/milo/server/features/survey/base/SurveyEntity.java
index e9a42f7f..f1f7d74b 100644
--- a/src/main/java/app/milo/server/features/survey/base/SurveyEntity.java
+++ b/src/main/java/app/milo/server/features/survey/base/SurveyEntity.java
@@ -2,13 +2,13 @@
 
 import java.time.OffsetDateTime;
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.base.contact.ContactEntity;
 import app.milo.server.core.base.BaseEntity;
diff --git a/src/main/java/app/milo/server/features/survey/base/media/SurveyMediaEntity.java b/src/main/java/app/milo/server/features/survey/base/media/SurveyMediaEntity.java
index 24c6c7bb..2564bbee 100644
--- a/src/main/java/app/milo/server/features/survey/base/media/SurveyMediaEntity.java
+++ b/src/main/java/app/milo/server/features/survey/base/media/SurveyMediaEntity.java
@@ -1,12 +1,12 @@
 package app.milo.server.features.survey.base.media;
 
-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 javax.persistence.UniqueConstraint;
+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 jakarta.persistence.UniqueConstraint;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.media.base.MediaEntity;
 import app.milo.server.features.survey.base.SurveyEntity;
diff --git a/src/main/java/app/milo/server/features/survey/base/translations/SurveyTranslatableEntity.java b/src/main/java/app/milo/server/features/survey/base/translations/SurveyTranslatableEntity.java
index 0d6061f7..0ee7df1d 100644
--- a/src/main/java/app/milo/server/features/survey/base/translations/SurveyTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/survey/base/translations/SurveyTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.survey.base.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.survey.base.SurveyEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/survey/base/visitors/SurveyVisitorEntity.java b/src/main/java/app/milo/server/features/survey/base/visitors/SurveyVisitorEntity.java
index c7f6396f..faecec52 100644
--- a/src/main/java/app/milo/server/features/survey/base/visitors/SurveyVisitorEntity.java
+++ b/src/main/java/app/milo/server/features/survey/base/visitors/SurveyVisitorEntity.java
@@ -1,7 +1,7 @@
 package app.milo.server.features.survey.base.visitors;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import app.milo.server.core.visit.visitable.VisitableEntity;
 import app.milo.server.features.survey.base.SurveyEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/survey/question/SurveyQuestionEntity.java b/src/main/java/app/milo/server/features/survey/question/SurveyQuestionEntity.java
index 01a044a6..e65ff4f3 100644
--- a/src/main/java/app/milo/server/features/survey/question/SurveyQuestionEntity.java
+++ b/src/main/java/app/milo/server/features/survey/question/SurveyQuestionEntity.java
@@ -1,13 +1,13 @@
 package app.milo.server.features.survey.question;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.features.survey.answer.SurveyAnswerEntity;
diff --git a/src/main/java/app/milo/server/features/survey/question/translations/SurveyQuestionTranslatableEntity.java b/src/main/java/app/milo/server/features/survey/question/translations/SurveyQuestionTranslatableEntity.java
index 1ee1dd00..e4001016 100644
--- a/src/main/java/app/milo/server/features/survey/question/translations/SurveyQuestionTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/survey/question/translations/SurveyQuestionTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.survey.question.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.survey.question.SurveyQuestionEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/survey/questionOption/SurveyQuestionOptionEntity.java b/src/main/java/app/milo/server/features/survey/questionOption/SurveyQuestionOptionEntity.java
index 2b4e7f88..6bd76025 100644
--- a/src/main/java/app/milo/server/features/survey/questionOption/SurveyQuestionOptionEntity.java
+++ b/src/main/java/app/milo/server/features/survey/questionOption/SurveyQuestionOptionEntity.java
@@ -1,13 +1,13 @@
 package app.milo.server.features.survey.questionOption;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
diff --git a/src/main/java/app/milo/server/features/survey/questionOption/translations/SurveyQuestionOptionTranslatableEntity.java b/src/main/java/app/milo/server/features/survey/questionOption/translations/SurveyQuestionOptionTranslatableEntity.java
index 0c1ca255..8d7089c0 100644
--- a/src/main/java/app/milo/server/features/survey/questionOption/translations/SurveyQuestionOptionTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/survey/questionOption/translations/SurveyQuestionOptionTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.survey.questionOption.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.survey.questionOption.SurveyQuestionOptionEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/survey/questionType/SurveyQuestionTypeEntity.java b/src/main/java/app/milo/server/features/survey/questionType/SurveyQuestionTypeEntity.java
index 4ea74575..801109d7 100644
--- a/src/main/java/app/milo/server/features/survey/questionType/SurveyQuestionTypeEntity.java
+++ b/src/main/java/app/milo/server/features/survey/questionType/SurveyQuestionTypeEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.survey.questionType;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.features.survey.question.SurveyQuestionEntity;
diff --git a/src/main/java/app/milo/server/features/survey/result/SurveyResultEntity.java b/src/main/java/app/milo/server/features/survey/result/SurveyResultEntity.java
index a4d0b00b..89f7735c 100644
--- a/src/main/java/app/milo/server/features/survey/result/SurveyResultEntity.java
+++ b/src/main/java/app/milo/server/features/survey/result/SurveyResultEntity.java
@@ -1,12 +1,12 @@
 package app.milo.server.features.survey.result;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import app.milo.server.base.userContext.base.UserContextEntity;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.i18n.annotations.Translatable;
diff --git a/src/main/java/app/milo/server/features/survey/result/translations/SurveyResultTranslatableEntity.java b/src/main/java/app/milo/server/features/survey/result/translations/SurveyResultTranslatableEntity.java
index 48c0e6d9..60092af9 100644
--- a/src/main/java/app/milo/server/features/survey/result/translations/SurveyResultTranslatableEntity.java
+++ b/src/main/java/app/milo/server/features/survey/result/translations/SurveyResultTranslatableEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.features.survey.result.translations;
 
-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 app.milo.server.core.i18n.entities.TranslatableEntity;
 import app.milo.server.features.survey.result.SurveyResultEntity;
 import lombok.AccessLevel;
diff --git a/src/main/java/app/milo/server/features/survey/state/SurveyStateEntity.java b/src/main/java/app/milo/server/features/survey/state/SurveyStateEntity.java
index a3733149..f95d9a52 100644
--- a/src/main/java/app/milo/server/features/survey/state/SurveyStateEntity.java
+++ b/src/main/java/app/milo/server/features/survey/state/SurveyStateEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.features.survey.state;
 
 import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.features.survey.base.SurveyEntity;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 25897b29..7b519b18 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,3 +1,7 @@
+logging.level.org.springframework.jdbc.core.JdbcTemplate=DEBUG
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+
 #################
 ## APPLICATION ##
 #################
diff --git a/src/main/resources/database/changes/0004.migrate_data_user_roles.yaml b/src/main/resources/database/changes/0004.migrate_data_user_roles.yaml
index 268b3bb5..b4a5d3e7 100644
--- a/src/main/resources/database/changes/0004.migrate_data_user_roles.yaml
+++ b/src/main/resources/database/changes/0004.migrate_data_user_roles.yaml
@@ -29,9 +29,8 @@ databaseChangeLog:
             dbms: mysql
             endDelimiter: \nGO
             splitStatements: true
-            sql: ALTER TABLE user_roles CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;              
-            
-            
+            sql: ALTER TABLE user_roles CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;                   
+                      
   - changeSet:
       id: 0004.add_data_user_roles.4
       author: codeschluss
diff --git a/src/main/resources/database/changes/0168.change_column_type_contests.yaml b/src/main/resources/database/changes/0168.change_column_type_contests.yaml
index df0f253a..6df04998 100644
--- a/src/main/resources/database/changes/0168.change_column_type_contests.yaml
+++ b/src/main/resources/database/changes/0168.change_column_type_contests.yaml
@@ -1,16 +1,16 @@
 databaseChangeLog:
   - logicalFilePath: path_independent
   - changeSet:
-      id: 0167.change_column_type_contests.1
+      id: 0168.change_column_type_contests.1
       author: codeschluss
       changes:
         - modifyDataType:
             columnName: text_submission
             newDataType: longtext
             tableName: contest_participation_translatables
-            
+                  
   - changeSet:
-      id: 0167.change_column_type_contests.2
+      id: 0168.change_column_type_contests.2
       author: codeschluss
       changes:
         - modifyDataType:
diff --git a/src/main/resources/database/changes/0178.add_default_uuids.yaml b/src/main/resources/database/changes/0178.add_default_uuids.yaml
new file mode 100644
index 00000000..197833b5
--- /dev/null
+++ b/src/main/resources/database/changes/0178.add_default_uuids.yaml
@@ -0,0 +1,129 @@
+databaseChangeLog:
+  - logicalFilePath: path_independent
+  - changeSet:
+      id: 0178.add_default_uuids.1
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: user_roles
+            defaultValueComputed: (UUID())
+            
+  - changeSet:
+      id: 0178.add_default_uuids.2
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: role_role_privileges
+            defaultValueComputed: (UUID())      
+            
+  - changeSet:
+      id: 0178.add_default_uuids.3
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: page_embedding_types_attribute_types
+            defaultValueComputed: (UUID()) 
+            
+  - changeSet:
+      id: 0178.add_default_uuids.4
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: user_context_contacts
+            defaultValueComputed: (UUID())                     
+            
+  - changeSet:
+      id: 0178.add_default_uuids.5
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: favorite_articles
+            defaultValueComputed: (UUID())    
+            
+  - changeSet:
+      id: 0178.add_default_uuids.6
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: favorite_authors
+            defaultValueComputed: (UUID())    
+            
+  - changeSet:
+      id: 0178.add_default_uuids.7
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: favorite_events
+            defaultValueComputed: (UUID())          
+            
+  - changeSet:
+      id: 0178.add_default_uuids.8
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: favorite_deals
+            defaultValueComputed: (UUID())  
+            
+  - changeSet:
+      id: 0178.add_default_uuids.9
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: favorite_organisations
+            defaultValueComputed: (UUID())  
+            
+  - changeSet:
+      id: 0178.add_default_uuids.10
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: message_definition_channels
+            defaultValueComputed: (UUID()) 
+            
+  - changeSet:
+      id: 0178.add_default_uuids.11
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: message_definition_users
+            defaultValueComputed: (UUID())             
+            
+  - changeSet:
+      id: 0178.add_default_uuids.12
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: user_deletion_user_deletion_types
+            defaultValueComputed: (UUID())                                                      
+            
+  - changeSet:
+      id: 0178.add_default_uuids.13
+      author: milo
+      changes:
+        - addDefaultValue:
+            columnName: id
+            tableName: event_event_target_groups
+            defaultValueComputed: (UUID())     
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+                                                  
\ No newline at end of file
diff --git a/src/main/resources/database/masters/development-master.yaml b/src/main/resources/database/masters/development-master.yaml
index d65011c6..70acd551 100644
--- a/src/main/resources/database/masters/development-master.yaml
+++ b/src/main/resources/database/masters/development-master.yaml
@@ -306,8 +306,6 @@ databaseChangeLog:
         file: database/changes/0168.change_column_type_contests.yaml 
     - include:                 
         file: database/changes/0169.modify_type_short_description.yaml                   
-    - include:
-        file: database/changes/0168.change_column_type_contests.yaml
     - include:                 
         file: database/changes/0170.create_table_navigator_pages.yaml  
     - include:                 
@@ -324,6 +322,8 @@ databaseChangeLog:
         file: database/changes/0176.change_column_type_page_attribute.yaml                                          
     - include:
         file: database/changes/0177.add_column_plugin_translatables.yaml   
+    - include:
+        file: database/changes/0178.add_default_uuids.yaml        
                                    
     #Data section
     - include:
diff --git a/src/main/resources/database/masters/production-master.yaml b/src/main/resources/database/masters/production-master.yaml
index d200e81e..b196de37 100644
--- a/src/main/resources/database/masters/production-master.yaml
+++ b/src/main/resources/database/masters/production-master.yaml
@@ -306,8 +306,6 @@ databaseChangeLog:
         file: database/changes/0168.change_column_type_contests.yaml 
     - include:                 
         file: database/changes/0169.modify_type_short_description.yaml                   
-    - include:
-        file: database/changes/0168.change_column_type_contests.yaml
     - include:                 
         file: database/changes/0170.create_table_navigator_pages.yaml  
     - include:                 
@@ -324,6 +322,8 @@ databaseChangeLog:
         file: database/changes/0176.change_column_type_page_attribute.yaml                                                 
     - include:
         file: database/changes/0177.add_column_plugin_translatables.yaml
+    - include:
+        file: database/changes/0178.add_default_uuids.yaml        
 
     #Data section
     - include:
diff --git a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceGetByExampleTest.java b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceGetByExampleTest.java
index c53db66f..62ac9e9e 100644
--- a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceGetByExampleTest.java
+++ b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceGetByExampleTest.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceReadAllTest.java b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceReadAllTest.java
index a843bf51..cfe765b9 100644
--- a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceReadAllTest.java
+++ b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceReadAllTest.java
@@ -13,7 +13,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceSaveTest.java b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceSaveTest.java
index 1dd9687e..b205ca88 100644
--- a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceSaveTest.java
+++ b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceSaveTest.java
@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/app/milo/server/test/units/core/base/graphbuilder/GraphBuilderCreateTest.java b/src/test/java/app/milo/server/test/units/core/base/graphbuilder/GraphBuilderCreateTest.java
index 0c7e9950..b8fc50c8 100644
--- a/src/test/java/app/milo/server/test/units/core/base/graphbuilder/GraphBuilderCreateTest.java
+++ b/src/test/java/app/milo/server/test/units/core/base/graphbuilder/GraphBuilderCreateTest.java
@@ -8,9 +8,9 @@
 import java.io.IOException;
 import java.io.StringReader;
 
-import javax.persistence.AttributeNode;
-import javax.persistence.EntityManager;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.persistence.AttributeNode;
+import jakarta.persistence.EntityManager;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/app/milo/server/test/units/core/config/GraphQlContextAdapterTest.java b/src/test/java/app/milo/server/test/units/core/config/GraphQlContextAdapterTest.java
index 7691d515..8661b31c 100644
--- a/src/test/java/app/milo/server/test/units/core/config/GraphQlContextAdapterTest.java
+++ b/src/test/java/app/milo/server/test/units/core/config/GraphQlContextAdapterTest.java
@@ -8,7 +8,7 @@
 import java.io.IOException;
 import java.io.StringReader;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/app/milo/server/test/units/core/config/MultiReadHttpServletRequestTest.java b/src/test/java/app/milo/server/test/units/core/config/MultiReadHttpServletRequestTest.java
index 4c8a18f3..3fafdd69 100644
--- a/src/test/java/app/milo/server/test/units/core/config/MultiReadHttpServletRequestTest.java
+++ b/src/test/java/app/milo/server/test/units/core/config/MultiReadHttpServletRequestTest.java
@@ -8,9 +8,9 @@
 import java.io.IOException;
 import java.io.StringReader;
 
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/app/milo/server/test/units/core/messaging/MailServiceTest.java b/src/test/java/app/milo/server/test/units/core/messaging/MailServiceTest.java
index 6ecbe543..40db6bd9 100644
--- a/src/test/java/app/milo/server/test/units/core/messaging/MailServiceTest.java
+++ b/src/test/java/app/milo/server/test/units/core/messaging/MailServiceTest.java
@@ -7,10 +7,10 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/base/QTestEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/base/QTestEntity.java
index fe9d749a..e29e8fe3 100644
--- a/src/test/java/app/milo/server/test/units/core/setup/entities/base/QTestEntity.java
+++ b/src/test/java/app/milo/server/test/units/core/setup/entities/base/QTestEntity.java
@@ -2,7 +2,7 @@
 
 import static com.querydsl.core.types.PathMetadataFactory.forVariable;
 
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 import com.querydsl.core.types.Path;
 import com.querydsl.core.types.PathMetadata;
diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/base/TestEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/base/TestEntity.java
index 5d3c9f28..fcb2b79f 100644
--- a/src/test/java/app/milo/server/test/units/core/setup/entities/base/TestEntity.java
+++ b/src/test/java/app/milo/server/test/units/core/setup/entities/base/TestEntity.java
@@ -2,14 +2,14 @@
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.config.DefaultSort;
 import app.milo.server.test.units.core.setup.entities.child.TestChildEntity;
diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/child/QTestChildEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/child/QTestChildEntity.java
index 8b760ce1..e8274729 100644
--- a/src/test/java/app/milo/server/test/units/core/setup/entities/child/QTestChildEntity.java
+++ b/src/test/java/app/milo/server/test/units/core/setup/entities/child/QTestChildEntity.java
@@ -2,7 +2,7 @@
 
 import static com.querydsl.core.types.PathMetadataFactory.forVariable;
 
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 import com.querydsl.core.types.Path;
 import com.querydsl.core.types.PathMetadata;
diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/child/TestChildEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/child/TestChildEntity.java
index 1a1184fe..381d90a1 100644
--- a/src/test/java/app/milo/server/test/units/core/setup/entities/child/TestChildEntity.java
+++ b/src/test/java/app/milo/server/test/units/core/setup/entities/child/TestChildEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.test.units.core.setup.entities.child;
 
-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.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.config.DefaultSort;
 import app.milo.server.test.units.core.setup.entities.base.TestEntity;
diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/QTestListChildEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/QTestListChildEntity.java
index e369ce94..d5956c72 100644
--- a/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/QTestListChildEntity.java
+++ b/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/QTestListChildEntity.java
@@ -2,7 +2,7 @@
 
 import static com.querydsl.core.types.PathMetadataFactory.forVariable;
 
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 import com.querydsl.core.types.Path;
 import com.querydsl.core.types.PathMetadata;
diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/TestListChildEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/TestListChildEntity.java
index 3e67ad58..1c668b5b 100644
--- a/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/TestListChildEntity.java
+++ b/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/TestListChildEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.test.units.core.setup.entities.listChild;
 
-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.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.config.DefaultSort;
 import app.milo.server.test.units.core.setup.entities.base.TestEntity;
diff --git a/src/test/java/app/milo/server/test/units/core/setup/services/ImageReader.java b/src/test/java/app/milo/server/test/units/core/setup/services/ImageReader.java
index 03260a0a..b137c320 100644
--- a/src/test/java/app/milo/server/test/units/core/setup/services/ImageReader.java
+++ b/src/test/java/app/milo/server/test/units/core/setup/services/ImageReader.java
@@ -4,7 +4,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-
 import javax.imageio.ImageIO;
 
 public class ImageReader {
diff --git a/src/test/java/app/milo/server/test/units/core/setup/services/TestMailService.java b/src/test/java/app/milo/server/test/units/core/setup/services/TestMailService.java
index f13ee345..c97e2ae0 100644
--- a/src/test/java/app/milo/server/test/units/core/setup/services/TestMailService.java
+++ b/src/test/java/app/milo/server/test/units/core/setup/services/TestMailService.java
@@ -5,8 +5,8 @@
 
 import java.util.Properties;
 
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeMessage;
 
 import org.springframework.mail.javamail.JavaMailSender;
 import app.milo.server.core.config.GeneralConfiguration;
diff --git a/src/test/java/app/milo/server/test/units/core/utils/date/setup/DateUtilTestEntity.java b/src/test/java/app/milo/server/test/units/core/utils/date/setup/DateUtilTestEntity.java
index 588da647..9f4ee243 100644
--- a/src/test/java/app/milo/server/test/units/core/utils/date/setup/DateUtilTestEntity.java
+++ b/src/test/java/app/milo/server/test/units/core/utils/date/setup/DateUtilTestEntity.java
@@ -1,6 +1,6 @@
 package app.milo.server.test.units.core.utils.date.setup;
 
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 import app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/src/test/java/app/milo/server/test/units/core/utils/persistence/PersistenceUtilsMappedByTest.java b/src/test/java/app/milo/server/test/units/core/utils/persistence/PersistenceUtilsMappedByTest.java
index 4fa84e7e..b9b04d10 100644
--- a/src/test/java/app/milo/server/test/units/core/utils/persistence/PersistenceUtilsMappedByTest.java
+++ b/src/test/java/app/milo/server/test/units/core/utils/persistence/PersistenceUtilsMappedByTest.java
@@ -5,8 +5,8 @@
 
 import java.util.ArrayList;
 
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
 
 import org.junit.jupiter.api.Test;
 import app.milo.server.core.utils.PersistenceUtils;
diff --git a/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceEqualityEntity.java b/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceEqualityEntity.java
index a049667f..26bc5efc 100644
--- a/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceEqualityEntity.java
+++ b/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceEqualityEntity.java
@@ -1,11 +1,11 @@
 package app.milo.server.test.units.core.utils.persistence.setup;
 
-import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.Column;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.config.SetNullOnRemoval;
 import lombok.AccessLevel;
diff --git a/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceValidityEntity.java b/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceValidityEntity.java
index 291e688e..e5017aff 100644
--- a/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceValidityEntity.java
+++ b/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceValidityEntity.java
@@ -1,9 +1,9 @@
 package app.milo.server.test.units.core.utils.persistence.setup;
 
-import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import app.milo.server.core.base.BaseEntity;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationTest.java b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationTest.java
index af90600e..976a1d9e 100644
--- a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationTest.java
+++ b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationTest.java
@@ -5,7 +5,7 @@
 
 import java.util.ArrayList;
 
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 
 import org.junit.jupiter.api.Test;
 import app.milo.server.core.utils.ReflectionUtils;
diff --git a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationValueTest.java b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationValueTest.java
index 747682a6..2bb47c04 100644
--- a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationValueTest.java
+++ b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationValueTest.java
@@ -5,7 +5,7 @@
 
 import java.util.ArrayList;
 
-import javax.persistence.OneToMany;
+import jakarta.persistence.OneToMany;
 
 import org.junit.jupiter.api.Test;
 import app.milo.server.core.utils.ReflectionUtils;
diff --git a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetFieldWithAnnotationTest.java b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetFieldWithAnnotationTest.java
index 7961d381..e6f64675 100644
--- a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetFieldWithAnnotationTest.java
+++ b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetFieldWithAnnotationTest.java
@@ -6,7 +6,7 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 
-import javax.persistence.OneToMany;
+import jakarta.persistence.OneToMany;
 
 import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/app/milo/server/test/units/core/utils/reflection/setup/ReflectionTestEntity.java b/src/test/java/app/milo/server/test/units/core/utils/reflection/setup/ReflectionTestEntity.java
index 18e26d8c..97e025ca 100644
--- a/src/test/java/app/milo/server/test/units/core/utils/reflection/setup/ReflectionTestEntity.java
+++ b/src/test/java/app/milo/server/test/units/core/utils/reflection/setup/ReflectionTestEntity.java
@@ -1,8 +1,8 @@
 package app.milo.server.test.units.core.utils.reflection.setup;
 
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import app.milo.server.core.base.BaseEntity;
 import app.milo.server.core.config.DefaultSort;
 import lombok.AccessLevel;