diff --git a/amps/ags/license/licenses.properties b/amps/ags/license/licenses.properties
index 19b06c5c37..a739cc67b9 100644
--- a/amps/ags/license/licenses.properties
+++ b/amps/ags/license/licenses.properties
@@ -1,2 +1 @@
-alfresco_community=Alfresco Community
-alfresco_enterprise=Alfresco Enterprise
\ No newline at end of file
+alfresco_community=Alfresco Community
\ No newline at end of file
diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index e962738f37..553bbbe31f 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -2,67 +2,22 @@
 
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.alfresco</groupId>
-   <artifactId>alfresco-governance-services</artifactId>
+   <artifactId>alfresco-governance-services-community-parent</artifactId>
    <packaging>pom</packaging>
-   <version>3.5.1-SNAPSHOT</version>
-   <name>Alfresco Governance Services</name>
+   <name>Alfresco Governance Services Community Parent</name>
 
-   <url>http://www.alfresco.org/</url>
-   <inceptionYear>2005</inceptionYear>
-   <organization>
-      <name>Alfresco Software</name>
-      <url>http://www.alfresco.org/</url>
-   </organization>
-
-   <scm>
-      <connection>scm:git:https://github.com/Alfresco/governance-services.git</connection>
-      <developerConnection>scm:git:https://github.com/Alfresco/governance-services.git</developerConnection>
-      <url>https://github.com/Alfresco/governance-services</url>
-     <tag>HEAD</tag>
-  </scm>
-
-   <issueManagement>
-      <system>JIRA</system>
-      <url>https://issues.alfresco.com/jira/browse/RM</url>
-   </issueManagement>
-   <ciManagement>
-      <system>Bamboo</system>
-      <url>https://bamboo.alfresco.com/bamboo/browse/RM</url>
-   </ciManagement>
-
-   <prerequisites>
-      <maven>3.3.9</maven>
-   </prerequisites>
-
-   <distributionManagement>
-      <repository>
-         <id>alfresco-internal</id>
-         <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-releases/</url>
-      </repository>
-      <snapshotRepository>
-         <id>alfresco-internal-snapshots</id>
-         <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots/</url>
-      </snapshotRepository>
-   </distributionManagement>
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>alfresco-community-repo-amps</artifactId>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
+   </parent>
 
    <modules>
       <module>rm-community</module>
+      <module>rm-automation</module>
    </modules>
 
    <profiles>
-      <profile>
-         <id>enterprise</id>
-         <activation>
-            <property>
-               <name>!community</name>
-            </property>
-         </activation>
-         <modules>
-            <module>rm-enterprise</module>
-            <module>rm-automation</module>
-            <module>rm-benchmark</module>
-         </modules>
-      </profile>
       <!-- Generate the Javadoc for Public API only (filtered on AlfrescoPublicApi annotation) -->
       <profile>
       <id>publicapi</id>
@@ -398,8 +353,6 @@
       <alfresco.db.password>alfresco</alfresco.db.password>
       <alfresco.db.url>jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name}</alfresco.db.url>
       <alfresco.db.username>alfresco</alfresco.db.username>
-      <alfresco.groupId>org.alfresco</alfresco.groupId>
-      <alfresco.share.artifactId>share</alfresco.share.artifactId>
       <alfresco-spring-webscripts.version>8.15</alfresco-spring-webscripts.version>
       <api.explorer.version>7.0.0</api.explorer.version>
       <!-- Set this here and override it in the community and enterprise modules. -->
@@ -464,8 +417,6 @@
       <javax-jaxb-impl.version>3.0.0-M4</javax-jaxb-impl.version>
       <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
       <apache-compress.version>1.19</apache-compress.version>
-      <!-- 7.0.0 dependencies -->
-      <alfresco-community-repo.version>8.423</alfresco-community-repo.version>
    </properties>
 
    <dependencyManagement>
diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
index 20e84fc407..909ef5eb06 100644
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -1,14 +1,14 @@
 <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/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
-   <artifactId>alfresco-governance-services-automation</artifactId>
-   <name>Alfresco Governance Services Automation</name>
+   <artifactId>alfresco-governance-services-automation-community</artifactId>
+   <name>Alfresco Governance Services Automation Community</name>
    <packaging>pom</packaging>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
+      <artifactId>alfresco-governance-services-community-parent</artifactId>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
    </parent>
 
    <licenses>
@@ -19,8 +19,6 @@
 
    <modules>
       <module>rm-automation-community-rest-api</module>
-      <module>rm-automation-enterprise-rest-api</module>
-      <module>rm-automation-ui</module>
    </modules>
 
    <properties>
diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
index 2606b83732..0901808ac4 100644
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -7,8 +7,8 @@
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-governance-services-automation</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
+      <artifactId>alfresco-governance-services-automation-community</artifactId>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
    </parent>
 
    <properties>
@@ -57,6 +57,7 @@
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi</artifactId>
          <version>${tas.restapi.version}</version>
+         <scope>provided</scope>
          <exclusions>
             <exclusion>
                <groupId>com.fasterxml.jackson.core</groupId>
@@ -71,6 +72,7 @@
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>utility</artifactId>
+         <scope>provided</scope>
          <version>${tas.utility.version}</version>
       </dependency>
       <dependency>
@@ -105,5 +107,19 @@
          <artifactId>jackson-databind</artifactId>
          <version>${jackson.databind.version}</version>
       </dependency>
+      <dependency>
+         <groupId>org.json</groupId>
+         <artifactId>json</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco.test</groupId>
+         <artifactId>dataprep</artifactId>
+         <scope>compile</scope>
+      </dependency>
+      <dependency>
+         <groupId>io.rest-assured</groupId>
+         <artifactId>rest-assured</artifactId>
+         <scope>compile</scope>
+      </dependency>
    </dependencies>
 </project>
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index f3ad143e62..691cd84721 100644
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,8 +7,8 @@
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
+      <artifactId>alfresco-governance-services-community-parent</artifactId>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
    </parent>
 
    <licenses>
@@ -20,22 +20,14 @@
    <modules>
       <module>rm-community-rest-api-explorer</module>
       <module>rm-community-repo</module>
-      <module>rm-community-share</module>
    </modules>
 
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>${alfresco.groupId}</groupId>
+            <groupId>org.alfresco</groupId>
             <artifactId>alfresco-community-repo</artifactId>
-            <version>${alfresco-community-repo.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-         </dependency>
-         <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco-share-parent</artifactId>
-            <version>${share.version}</version>
+            <version>${project.version}</version>
             <type>pom</type>
             <scope>import</scope>
          </dependency>
@@ -75,8 +67,6 @@
    <properties>
       <spring.version>5.3.3</spring.version>
       <alfresco.min.version>7.0.0</alfresco.min.version>
-      <share.version>7.0.0</share.version>
-      <!-- The properties app.amp.* need to be set for share to work. -->
       <app.filtering.enabled>true</app.filtering.enabled>
    </properties>
 
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index 6468c6d241..09148f583f 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -2,14 +2,14 @@
 
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-governance-services-community-repo</artifactId>
-   <name>AGS Repo</name>
+   <name>Alfresco Governance Services Community Repository</name>
    <description>Alfresco Governance Services Repository Extension</description>
    <packaging>amp</packaging>
 
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
    </parent>
 
    <properties>
@@ -198,10 +198,10 @@
                      <outputDirectory>${app.amp.client.war.folder}</outputDirectory>
                      <artifactItems>
                         <artifactItem>
-                           <groupId>${alfresco.groupId}</groupId>
+                           <groupId>org.alfresco</groupId>
                            <artifactId>content-services-community</artifactId>
                            <type>war</type>
-                           <version>${alfresco-community-repo.version}</version>
+                           <version>${project.version}</version>
                         </artifactItem>
                      </artifactItems>
                   </configuration>
@@ -323,39 +323,39 @@
       <dependency>
          <groupId>org.alfresco</groupId>
          <artifactId>alfresco-data-model</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>${alfresco.groupId}</groupId>
+         <groupId>org.alfresco</groupId>
          <artifactId>alfresco-remote-api</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>${alfresco.groupId}</groupId>
+         <groupId>org.alfresco</groupId>
          <artifactId>alfresco-repository</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>${alfresco.groupId}</groupId>
+         <groupId>org.alfresco</groupId>
          <artifactId>alfresco-repository</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>${alfresco.groupId}</groupId>
+         <groupId>org.alfresco</groupId>
          <artifactId>alfresco-remote-api</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>${alfresco.groupId}</groupId>
+         <groupId>org.alfresco</groupId>
          <artifactId>alfresco-core</artifactId>
-         <version>${alfresco-community-repo.version}</version>
+         <version>${project.version}</version>
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>
@@ -492,10 +492,10 @@
                            <outputDirectory>${app.amp.client.war.folder}</outputDirectory>
                            <artifactItems>
                               <artifactItem>
-                                 <groupId>${alfresco.groupId}</groupId>
+                                 <groupId>org.alfresco</groupId>
                                  <artifactId>content-services-community</artifactId>
                                  <type>war</type>
-                                 <version>${alfresco-community-repo.version}</version>
+                                 <version>${project.version}</version>
                               </artifactItem>
                            </artifactItems>
                         </configuration>
diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
index a892c5aa15..1e6950cc4f 100644
--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/amps/pom.xml b/amps/pom.xml
new file mode 100644
index 0000000000..9395558b4f
--- /dev/null
+++ b/amps/pom.xml
@@ -0,0 +1,16 @@
+<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>
+    <artifactId>alfresco-community-repo-amps</artifactId>
+    <name>AMPs</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-community-repo</artifactId>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>ags</module>
+    </modules>
+</project>
diff --git a/core/pom.xml b/core/pom.xml
index e2c25a8c5e..41bbf0a93c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>11.21-SNAPSHOT</version>
+      <version>11.21-ags-1.0-SNAPSHOT</version>
    </parent>
 
    <dependencies>
diff --git a/data-model/pom.xml b/data-model/pom.xml
index 95ff8ea12e..a98cd03154 100644
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml
index 72fc4c73b4..50ec00ad41 100644
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 </project>
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index b1e754e336..c2a923eb38 100644
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index d92e8ed320..c15e86b94a 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <profiles>
diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index 770c1fb9f9..f67269f404 100644
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index d471aa9426..e7eb8e819a 100644
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
index faf8e5a787..e771aaeb5c 100644
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index 0c2393877c..94efd5b571 100644
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index f1e0193b88..c1e547c8fe 100644
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
index 3609b92e81..0746a5bf5d 100644
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index b0f2167253..4cadc16db8 100644
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index ced4d7bf86..d93baafaae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <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>
     <artifactId>alfresco-community-repo</artifactId>
-    <version>11.21-SNAPSHOT</version>
+    <version>11.21-ags-1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -18,6 +18,7 @@
         <module>repository</module>
         <module>remote-api</module>
         <module>packaging</module>
+        <module>amps</module>
     </modules>
 
     <properties>
@@ -61,7 +62,7 @@
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
         <dependency.webscripts.version>8.18</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.68</dependency.bouncycastle.version>
-        <dependency.mockito-core.version>3.9.0</dependency.mockito-core.version>
+        <dependency.mockito-core.version>3.8.0</dependency.mockito-core.version>
         <dependency.org-json.version>20210307</dependency.org-json.version>
         <dependency.commons-dbcp.version>1.4-DBCP330</dependency.commons-dbcp.version>
         <dependency.commons-io.version>2.8.0</dependency.commons-io.version>
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index 63c8712c46..a9a0229b62 100644
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/repository/pom.xml b/repository/pom.xml
index 25aa0a58d0..3065f9aff8 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>11.21-SNAPSHOT</version>
+        <version>11.21-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>