diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 0f73699ff4..d09a248459 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>12.21-SNAPSHOT</version>
+      <version>12.21</version>
    </parent>
 
    <modules>
diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
index 06139ceed3..a56bf25d22 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>12.21-SNAPSHOT</version>
+      <version>12.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 59310d6002..af78c1737f 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>12.21-SNAPSHOT</version>
+      <version>12.21</version>
    </parent>
 
 
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index 80917c2eb7..4990da8608 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>12.21-SNAPSHOT</version>
+      <version>12.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 beff66fd3e..9719dc3f13 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>12.21-SNAPSHOT</version>
+      <version>12.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 e951f9db71..c65817f3e7 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <build>
diff --git a/amps/pom.xml b/amps/pom.xml
index 36740f7089..1497a4aecf 100644
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <modules>
diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml
index 165e7e3086..b754ff53e1 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <properties>
diff --git a/core/pom.xml b/core/pom.xml
index 6a2644e893..48f444f3ba 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>12.21-SNAPSHOT</version>
+      <version>12.21</version>
    </parent>
 
    <dependencies>
diff --git a/data-model/pom.xml b/data-model/pom.xml
index db931eaf7e..b65828c1de 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <properties>
diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml
index 5fc4252087..92fba5d42d 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 </project>
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index c6828962ec..e6e709237a 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <properties>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 36be072ec6..09a6fd8dac 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index 7422f65838..74baf16f24 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index f55f8bc6ae..b5101571b8 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
index 3cd49669e3..d466608750 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index b9f4af87d1..e5b7556db0 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index 5a1e7695c6..9a98152598 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
index 9df10fc18e..93d98f961d 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <developers>
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index e1752f8c70..8effb18059 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index 4412322b7a..6ed5fdb2b2 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>12.21-SNAPSHOT</version> 
+    <version>12.21</version> 
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -143,7 +143,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>12.21</tag>
     </scm>
 
     <distributionManagement>
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index 5adb5bfd49..f2689f6af3 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>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <dependencies>
diff --git a/repository/pom.xml b/repository/pom.xml
index 65602fc8b3..72c62123d7 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>12.21-SNAPSHOT</version>
+        <version>12.21</version>
     </parent>
 
     <dependencies>