diff --git a/pom.xml b/pom.xml
index ebfaa8e..f903800 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
 
     <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
     <flexmark.version>0.61.10</flexmark.version>
+    <hibernate.version>5.4.14.Final</hibernate.version>
     <hibernate-types.version>2.9.8</hibernate-types.version>
     <jakarta-jacc-api.version>1.6.1</jakarta-jacc-api.version>
     <jna.version>5.5.0</jna.version>
@@ -105,12 +106,6 @@
         <artifactId>mapstruct</artifactId>
         <version>${mapstruct.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.mapstruct</groupId>
-        <artifactId>mapstruct-processor</artifactId>
-        <version>${mapstruct.version}</version>
-        <scope>provided</scope>
-      </dependency>
 
       <!-- Annotations -->
       <dependency>
@@ -220,12 +215,6 @@
       <artifactId>hibernate-types-52</artifactId>
     </dependency>
 
-    <!-- Hibernate -->
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-jpamodelgen</artifactId>
-    </dependency>
-
     <!-- Jsoup -->
     <dependency>
       <groupId>org.jsoup</groupId>
@@ -255,11 +244,6 @@
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.mapstruct</groupId>
-      <artifactId>mapstruct-processor</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
     <!-- Annotations -->
     <dependency>
@@ -317,6 +301,24 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${compiler-plugin.version}</version>
+
+        <configuration>
+          <annotationProcessorPaths>
+            <!-- Hibernate -->
+            <annotationProcessorPath>
+              <groupId>org.hibernate</groupId>
+              <artifactId>hibernate-jpamodelgen</artifactId>
+              <version>${hibernate.version}</version>
+            </annotationProcessorPath>
+
+            <!-- MapStruct -->
+            <annotationProcessorPath>
+              <groupId>org.mapstruct</groupId>
+              <artifactId>mapstruct-processor</artifactId>
+              <version>${mapstruct.version}</version>
+            </annotationProcessorPath>
+          </annotationProcessorPaths>
+        </configuration>
       </plugin>
 
       <plugin>