diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index a5c2761082..fdc01131ee 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.3.0.21-SNAPSHOT</version>
+      <version>23.3.0.21</version>
    </parent>
 
    <modules>
diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
index c2fd7be633..5adf55f5c9 100644
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.3.0.21-SNAPSHOT</version>
+      <version>23.3.0.21</version>
    </parent>
 
    <modules>
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 dc44e0095e..61da475ac0 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,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>23.3.0.21-SNAPSHOT</version>
+      <version>23.3.0.21</version>
    </parent>
 
    <build>
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index 02a3dc2fd4..7d9170af42 100644
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.3.0.21-SNAPSHOT</version>
+      <version>23.3.0.21</version>
    </parent>
 
    <modules>
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index 0410941888..73f3f7d655 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.3.0.21-SNAPSHOT</version>
+      <version>23.3.0.21</version>
    </parent>
 
    <properties>
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 94736d894f..952ea7f7b6 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-repo-parent</artifactId>
-        <version>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <build>
diff --git a/amps/pom.xml b/amps/pom.xml
index df448c7067..626519cd56 100644
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <modules>
diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml
index d30ea1027d..66093e7d40 100644
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <properties>
diff --git a/core/pom.xml b/core/pom.xml
index 2362e785a8..a862688902 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>23.3.0.21-SNAPSHOT</version>
+      <version>23.3.0.21</version>
    </parent>
 
    <dependencies>
diff --git a/data-model/pom.xml b/data-model/pom.xml
index c79df345d4..0b0a04b3a1 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>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <properties>
diff --git a/mmt/pom.xml b/mmt/pom.xml
index e7e06285ba..b4473ce9c2 100644
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <dependencies>
diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml
index 3de7c22b13..7bd694181c 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>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 </project>
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index a59a975ef9..ce384095cd 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>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <properties>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index c65130042a..ae3ce8f5ed 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index 4a53d16ae4..0a89a1638b 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>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index 78e63b4dcd..f86d7ff64b 100644
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <organization>
diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
index f8e0e95bb9..23c78c1e80 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>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index 0fb85630ab..47354a5008 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>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index c454021c22..9fd3ca41c2 100644
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <properties>
diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
index 2447f8bab1..8b10aba36a 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>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <developers>
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index 18cacda8f9..93345f37ca 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>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index 1351a1b62b..2f71c6b203 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>23.3.0.21-SNAPSHOT</version>
+    <version>23.3.0.21</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -151,7 +151,7 @@
         <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>HEAD</tag>
+        <tag>23.3.0.21</tag>
     </scm>
 
     <distributionManagement>
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index 8df0791d6e..75435414ed 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>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <dependencies>
diff --git a/repository/pom.xml b/repository/pom.xml
index 2a2cefd039..6d18cae629 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.3.0.21-SNAPSHOT</version>
+        <version>23.3.0.21</version>
     </parent>
 
     <dependencies>