diff --git a/dev/dev-acs-amps-overlay/pom.xml b/dev/dev-acs-amps-overlay/pom.xml
index 8d551e138..8b5402f18 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <properties>
diff --git a/dev/dev-repo-amps-overlay/pom.xml b/dev/dev-repo-amps-overlay/pom.xml
index 0ceee74a2..38b2eee21 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <build>
diff --git a/dev/dev-share-amps-overlay/pom.xml b/dev/dev-share-amps-overlay/pom.xml
index d72fa587f..7cc97031a 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <build>
diff --git a/dev/dev-tomcat/pom.xml b/dev/dev-tomcat/pom.xml
index 95809577d..5640a2612 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <properties>
diff --git a/dev/pom.xml b/dev/pom.xml
index 038585415..43c1bbcba 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <properties>
diff --git a/distribution-ags/pom.xml b/distribution-ags/pom.xml
index e53889754..d5dde938f 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <dependencies>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 9cb312b0c..e5d9b4476 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <dependencies>
diff --git a/docker-alfresco/ags/pom.xml b/docker-alfresco/ags/pom.xml
index e41ca0b68..901bc57f4 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.3.0-A21-SNAPSHOT</version>
+      <version>23.3.0-A21</version>
    </parent>
 
    <properties>
diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index 354a37f94..5706f3bc6 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <properties>
diff --git a/docker-share/ags/pom.xml b/docker-share/ags/pom.xml
index 43cd61057..d93f2632c 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.3.0-A21-SNAPSHOT</version>
+      <version>23.3.0-A21</version>
    </parent>
 
    <properties>
diff --git a/docker-share/pom.xml b/docker-share/pom.xml
index 1c1e4075d..4eb2217d8 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.3.0-A21-SNAPSHOT</version>
+      <version>23.3.0-A21</version>
    </parent>
 </project>
diff --git a/pom.xml b/pom.xml
index 019415d54..2c3cc6b25 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.3.0-A21-SNAPSHOT</version>
+    <version>23.3.0-A21</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.3.0-A21</tag>
     </scm>
 
     <distributionManagement>
diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml
index 08dae75ff..e7c72dd0b 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
     <packaging>pom</packaging>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index 50040daab..10843a4c7 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <modules>
diff --git a/tests/tas-cmis/pom.xml b/tests/tas-cmis/pom.xml
index 21138c553..5744b91c4 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-distribution-zip/pom.xml b/tests/tas-distribution-zip/pom.xml
index 169942e7c..0f7c522fe 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.3.0-A21-SNAPSHOT</version>
+    <version>23.3.0-A21</version>
   </parent>
 
   <properties>
diff --git a/tests/tas-email/pom.xml b/tests/tas-email/pom.xml
index f3f6e5af8..8c42fbdf9 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-integration/pom.xml b/tests/tas-integration/pom.xml
index 7c85feb5c..c5b519043 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-restapi/pom.xml b/tests/tas-restapi/pom.xml
index 99d943104..10c47b1f5 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-webdav/pom.xml b/tests/tas-webdav/pom.xml
index 73881d9ff..0112867e8 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.3.0-A21-SNAPSHOT</version>
+        <version>23.3.0-A21</version>
     </parent>
 
     <developers>