diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index cc784bc157..5fb36cb5d6 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -38,33 +38,12 @@
    </properties>
 
    <dependencies>
-<!--      <dependency>-->
-<!--         <groupId>junit</groupId>-->
-<!--         <artifactId>junit</artifactId>-->
-<!--         <scope>test</scope>-->
-<!--      </dependency>-->
       <!-- XML jars removed in Java 11 but are provided by alfresco-content-services -->
-      <dependency>
-         <groupId>jakarta.xml.bind</groupId>
-         <artifactId>jakarta.xml.bind-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.glassfish.jaxb</groupId>
-         <artifactId>jaxb-runtime</artifactId>
-         <scope>provided</scope>
-      </dependency>
       <dependency>
          <groupId>jakarta.jws</groupId>
          <artifactId>jakarta.jws-api</artifactId>
          <scope>provided</scope>
       </dependency>
-
-      <dependency>
-         <groupId>org.apache.camel</groupId>
-         <artifactId>camel-mock</artifactId>
-         <scope>test</scope>
-      </dependency>
    </dependencies>
 
    <build>
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 3f7a4c010a..a7f97e33c5 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
@@ -11,7 +11,7 @@
    </parent>
 
    <properties>
-      <jackson.databind.version>2.7.9.1</jackson.databind.version>
+      <jackson.databind.version>2.7.9.1</jackson.databind.version> <!-- this should not be overridden - fixes 2 tests -->
    </properties>
 
    <build>
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index 7c484229f1..78659bef50 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -63,7 +63,6 @@
       <dependency>
          <groupId>org.alfresco.surf</groupId>
          <artifactId>spring-webscripts</artifactId>
-         <version>${dependency.webscripts.version}</version>
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 41bbf0a93c..fa374c3415 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-ags-1.0-SNAPSHOT</version>
+      <version>11.7-ags-1.0-SNAPSHOT</version>
    </parent>
 
    <dependencies>
diff --git a/data-model/pom.xml b/data-model/pom.xml
index 6c9a98aec2..9797ba6948 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml
index 50ec00ad41..2ad98466f6 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 </project>
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index 40959ce5fe..c1e4a28f4c 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 1f0b2754b8..f9eb9cda0d 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index f67269f404..bb55868821 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index e7eb8e819a..e91a9514f0 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
index e771aaeb5c..c843efd69e 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index 94efd5b571..d71f1aea2b 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index c1e547c8fe..15b0a473ed 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
index 0746a5bf5d..d87216e78a 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index d230eabfac..3599eb4748 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index 376728bf29..49118ca99b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,7 +315,6 @@
                 <artifactId>spring-webscripts</artifactId>
                 <version>${dependency.webscripts.version}</version>
                 <classifier>tests</classifier>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.alfresco.surf</groupId>
@@ -459,7 +458,6 @@
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-test</artifactId>
                 <version>${dependency.spring.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
@@ -664,7 +662,6 @@
                 <groupId>org.postgresql</groupId>
                 <artifactId>postgresql</artifactId>
                 <version>${dependency.postgresql.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>mysql</groupId>
@@ -675,7 +672,6 @@
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
                 <version>${dependency.mariadb.version}</version>
-                <scope>test</scope>
             </dependency>
 
             <dependency>
@@ -697,25 +693,21 @@
                 <groupId>org.alfresco.tas</groupId>
                 <artifactId>cmis</artifactId>
                 <version>${dependency.tas-cmis.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.alfresco.tas</groupId>
                 <artifactId>email</artifactId>
                 <version>${dependency.tas-email.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.alfresco.tas</groupId>
                 <artifactId>webdav</artifactId>
                 <version>${dependency.tas-webdav.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.alfresco.tas</groupId>
                 <artifactId>ftp</artifactId>
                 <version>${dependency.tas-ftp.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.alfresco.test</groupId>
@@ -733,7 +725,6 @@
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
                 <version>3.0.1</version>
-                <scope>provided</scope>
             </dependency>
 
             <!-- Test only dependencies, as popped up while running mvn test -->
@@ -741,25 +732,21 @@
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>4.13.2</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.antlr</groupId>
                 <artifactId>gunit</artifactId>
                 <version>${dependency.antlr.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-all</artifactId>
                 <version>${dependency.mockito-all.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
                 <version>${dependency.mockito-core.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>commons-dbcp</groupId>
@@ -838,7 +825,6 @@
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-mock</artifactId>
                 <version>${dependency.camel.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.taglibs</groupId>
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index a9a0229b62..e2602e0ea9 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-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>