diff --git a/data-model/pom.xml b/data-model/pom.xml
index 09cc269eff..2ea8877b2c 100644
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -27,7 +27,7 @@
             </plugin>
             <plugin>
                 <groupId>org.jibx</groupId>
-                <artifactId>jibx-maven-plugin</artifactId>
+                <artifactId>maven-jibx-plugin</artifactId>
                 <configuration>
                     <load>true</load>
                     <schemaBindingDirectory>${project.build.sourceDirectory}/org/alfresco/repo/dictionary</schemaBindingDirectory>
@@ -119,6 +119,7 @@
         <dependency>
             <groupId>org.jibx</groupId>
             <artifactId>jibx-run</artifactId>
+            <version>1.4.2</version>
         </dependency>
         <dependency> 
             <groupId>com.fasterxml.jackson.core</groupId> 
diff --git a/pom.xml b/pom.xml
index cc0bc9a17f..2337df05d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.alfresco</groupId>
     <artifactId>alfresco-community-repo</artifactId>
     <version>23.1.0.131-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
-    <inceptionYear>2005</inceptionYear>
+
+    <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>alfresco-super-pom</artifactId>
+      <version>12</version>
+    </parent>
 
     <modules>
         <module>core</module>
@@ -68,7 +71,6 @@
         <dependency.gson.version>2.8.9</dependency.gson.version>
         <dependency.httpclient.version>4.5.13</dependency.httpclient.version>
         <dependency.httpcore.version>4.4.16</dependency.httpcore.version>
-        <dependency.jibx.version>1.4.2</dependency.jibx.version>
         <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
         <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
         <dependency.slf4j.version>2.0.7</dependency.slf4j.version>
@@ -260,12 +262,6 @@
                 <version>${dependency.jakarta-rpc-api.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.jibx</groupId>
-                <artifactId>jibx-run</artifactId>
-                <version>${dependency.jibx.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-jlan-embed</artifactId>
@@ -970,15 +966,6 @@
                     <artifactId>alfresco-maven-plugin</artifactId>
                     <version>${alfresco.maven-plugin.version}</version>
                     <extensions>true</extensions>
-                    <configuration>
-                        <attachClasses>true</attachClasses>
-                        <ampBuildDirectory>${project.build.directory}/${project.build.finalName}</ampBuildDirectory>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.jibx</groupId>
-                    <artifactId>jibx-maven-plugin</artifactId>
-                    <version>${dependency.jibx.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
diff --git a/repository/pom.xml b/repository/pom.xml
index b5d321749e..42bc086913 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -864,7 +864,7 @@
 
          <plugin>
              <groupId>org.jibx</groupId>
-             <artifactId>jibx-maven-plugin</artifactId>
+             <artifactId>maven-jibx-plugin</artifactId>
              <configuration>
                  <load>true</load>
                  <schemaBindingDirectory>${project.build.outputDirectory}/org/alfresco/repo/importer/system</schemaBindingDirectory>