diff --git a/maven/pom.xml b/maven/pom.xml
index 8dd06536f8..7e6a3e40f7 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -25,61 +25,18 @@
   </parent>
 
   <artifactId>hibernate-tools-maven</artifactId>
-
   <packaging>maven-plugin</packaging>
 
   <name>Hibernate Tools Maven Plugin</name>
   <description>Maven plugin to provide hibernate-tools reverse engineering and code/schema generation abilities.</description>
-  <url>http://hibernate.org/tools/</url>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://hibernate.onjira.com/browse/HBX</url>
-  </issueManagement>
-
-  <scm>
-    <connection>scm:git:git://github.com/hibernate/hibernate-tools.git</connection>
-    <developerConnection>scm:git:git@github.com:hibernate/hibernate-tools.git</developerConnection>
-    <url>http://github.com/hibernate/hibernate-tools</url>
-  </scm>
-
-  <organization>
-    <name>Hibernate</name>
-    <url>http://www.hibernate.org</url>
-  </organization>
 
-  <licenses>
-    <license>
-      <name>Apache License, version 2.0</name>
-      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>stadler</id>
-      <name>Jacques Stadler</name>
-      <email>jacques.stadler+github@gmail.com</email>
-    </developer>
+    <developers>
   </developers>
 
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
-
   <properties>
-      <!-- This is a publicly distributed module that should be published: -->
+    <!-- This is a publicly distributed module that should be published: -->
     <deploy.skip>false</deploy.skip>
     <maven.install.skip>false</maven.install.skip>
-
-    <maven-plugin-annotations.version>3.5</maven-plugin-annotations.version>
-    <maven-plugin-api.version>3.5.2</maven-plugin-api.version>
-    <maven-core.version>3.9.9</maven-core.version>
-
-    <!-- Plugin versions -->
-    <maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
-    <maven-site-plugin.version>3.7</maven-site-plugin.version>
-    <site-maven-plugin.version>0.12</site-maven-plugin.version>
   </properties>
 
   <dependencies>
@@ -106,17 +63,14 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>${maven-plugin-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>${maven-core.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>${maven-plugin-annotations.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -163,7 +117,7 @@
       <plugin>
         <groupId>com.github.github</groupId>
         <artifactId>site-maven-plugin</artifactId>
-        <version>${site-maven-plugin.version}</version>
+        <version>${github-site-maven-plugin.version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/pom.xml b/pom.xml
index 4eb6c33074..6f0e60141a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,18 @@
 			<email>koen@hibernate.org</email>
 			<url>http://koentsje.blogspot.be</url>
 		</developer>
-	</developers>
+        <developer>
+            <id>stadler</id>
+            <name>Jacques Stadler</name>
+            <email>jacques.stadler+github@gmail.com</email>
+        </developer>
+        <developer>
+            <id>marko.bekhta</id>
+            <name>Marko Bekhta</name>
+            <email>marko@hibernate.org</email>
+            <url>http://in.relation.to/marko-bekhta/</url>
+        </developer>
+    </developers>
 
     <modules>
         <module>orm</module>
@@ -87,6 +98,8 @@
 
     <properties>
 
+        <maven.version>3.9.11</maven.version>
+
         <ant.version>1.10.15</ant.version>
         <antlr.version>4.13.2</antlr.version>
         <commons-collections.version>4.5.0</commons-collections.version>
@@ -105,9 +118,14 @@
         <jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
 
         <!-- Plugins not managed by the JBoss parent POM: -->
+        <maven-plugin-api.version>3.9.11</maven-plugin-api.version>
+        <maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
         <maven-wrapper-plugin.version>3.3.3</maven-wrapper-plugin.version>
         <flatten-maven-plugin.version>1.7.1</flatten-maven-plugin.version>
         <maven-invoker-plugin.version>3.9.1</maven-invoker-plugin.version>
+        <github-site-maven-plugin.version>0.12</github-site-maven-plugin.version>
+        <maven-project-info-reports-plugin.version>3.9.0</maven-project-info-reports-plugin.version>
+        <maven-site-plugin.version>3.21.0</maven-site-plugin.version>
 
         <!--
             We don't want to publish or sign any modules by default.
@@ -131,7 +149,9 @@
 
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
-        <maven.min.version>3.9.11</maven.min.version>
+        <maven.min.version>${maven.version}</maven.min.version>
+        <maven-core.version>${maven.version}</maven-core.version>
+
     </properties>
 
     <dependencyManagement>
@@ -191,6 +211,21 @@
 		        <artifactId>commons-collections4</artifactId>
 		        <version>${commons-collections.version}</version>
 	        </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-core</artifactId>
+                <version>${maven-core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-plugin-api</artifactId>
+                <version>${maven-plugin-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugin-tools</groupId>
+                <artifactId>maven-plugin-annotations</artifactId>
+                <version>${maven-plugin-annotations.version}</version>
+            </dependency>
 		    <dependency>
 			    <groupId>org.freemarker</groupId>
 			    <artifactId>freemarker</artifactId>