diff --git a/dev/dev-acs-amps-overlay/pom.xml b/dev/dev-acs-amps-overlay/pom.xml
index c52dcf683..a2103b176 100644
--- a/dev/dev-acs-amps-overlay/pom.xml
+++ b/dev/dev-acs-amps-overlay/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <properties>
diff --git a/dev/dev-repo-amps-overlay/pom.xml b/dev/dev-repo-amps-overlay/pom.xml
index cf1f0166c..279589e51 100644
--- a/dev/dev-repo-amps-overlay/pom.xml
+++ b/dev/dev-repo-amps-overlay/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <build>
diff --git a/dev/dev-share-amps-overlay/pom.xml b/dev/dev-share-amps-overlay/pom.xml
index f52b948a8..dd4a03a24 100644
--- a/dev/dev-share-amps-overlay/pom.xml
+++ b/dev/dev-share-amps-overlay/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <build>
diff --git a/dev/dev-tomcat/pom.xml b/dev/dev-tomcat/pom.xml
index 702faeffd..8dd8bb854 100644
--- a/dev/dev-tomcat/pom.xml
+++ b/dev/dev-tomcat/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <properties>
diff --git a/dev/pom.xml b/dev/pom.xml
index a3a815334..9ce0a5cc0 100644
--- a/dev/pom.xml
+++ b/dev/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <properties>
diff --git a/distribution-ags/pom.xml b/distribution-ags/pom.xml
index a40b66e44..e448de4e4 100644
--- a/distribution-ags/pom.xml
+++ b/distribution-ags/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <dependencies>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 6ef5670ba..20139139d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <dependencies>
diff --git a/docker-alfresco/ags/pom.xml b/docker-alfresco/ags/pom.xml
index 973baabae..4e3c5137e 100644
--- a/docker-alfresco/ags/pom.xml
+++ b/docker-alfresco/ags/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>content-services-community-docker</artifactId>
-      <version>23.1.0-A18-SNAPSHOT</version>
+      <version>23.1.0-A18</version>
    </parent>
 
    <properties>
diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index ba781a360..99f469e5c 100644
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <properties>
diff --git a/docker-share/ags/pom.xml b/docker-share/ags/pom.xml
index 4a1a861df..c58363e5b 100644
--- a/docker-share/ags/pom.xml
+++ b/docker-share/ags/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>share-community-docker</artifactId>
-      <version>23.1.0-A18-SNAPSHOT</version>
+      <version>23.1.0-A18</version>
    </parent>
 
    <properties>
diff --git a/docker-share/pom.xml b/docker-share/pom.xml
index 1a1c3c0b9..52fee694c 100644
--- a/docker-share/pom.xml
+++ b/docker-share/pom.xml
@@ -7,6 +7,6 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>acs-community-packaging</artifactId>
-      <version>23.1.0-A18-SNAPSHOT</version>
+      <version>23.1.0-A18</version>
    </parent>
 </project>
diff --git a/pom.xml b/pom.xml
index 46c7f839c..ab270f0c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <artifactId>acs-community-packaging</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>23.1.0-A18-SNAPSHOT</version>
+    <version>23.1.0-A18</version>
 
     <parent>
         <groupId>org.alfresco</groupId>
@@ -25,7 +25,7 @@
         <connection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</developerConnection>
         <url>https://github.com/Alfresco/acs-community-packaging</url>
-        <tag>HEAD</tag>
+        <tag>23.1.0-A18</tag>
     </scm>
 
     <distributionManagement>
diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml
index 7ce0363c4..4e554ffa5 100644
--- a/public-javadoc/pom.xml
+++ b/public-javadoc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
     <packaging>pom</packaging>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index a34b6053b..a56862315 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <modules>
diff --git a/tests/tas-cmis/pom.xml b/tests/tas-cmis/pom.xml
index e8f92acf7..bdfbfac7d 100644
--- a/tests/tas-cmis/pom.xml
+++ b/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-distribution-zip/pom.xml b/tests/tas-distribution-zip/pom.xml
index d1c3cc1bf..1b3d635ea 100644
--- a/tests/tas-distribution-zip/pom.xml
+++ b/tests/tas-distribution-zip/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.alfresco</groupId>
     <artifactId>content-repository-community-tests</artifactId>
-    <version>23.1.0-A18-SNAPSHOT</version>
+    <version>23.1.0-A18</version>
   </parent>
 
   <properties>
diff --git a/tests/tas-email/pom.xml b/tests/tas-email/pom.xml
index 5394004f2..d9358d738 100644
--- a/tests/tas-email/pom.xml
+++ b/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-integration/pom.xml b/tests/tas-integration/pom.xml
index 4e03da95c..0619e71de 100644
--- a/tests/tas-integration/pom.xml
+++ b/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-restapi/pom.xml b/tests/tas-restapi/pom.xml
index 8ff6f3517..48200ed2e 100644
--- a/tests/tas-restapi/pom.xml
+++ b/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-webdav/pom.xml b/tests/tas-webdav/pom.xml
index 069a4d60c..5497cd573 100644
--- a/tests/tas-webdav/pom.xml
+++ b/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>23.1.0-A18-SNAPSHOT</version>
+        <version>23.1.0-A18</version>
     </parent>
 
     <developers>