diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 23aa60cea..005cc0c92 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,9 +29,9 @@ env:
   QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
   TAS_ENVIRONMENT: ./tests/environment
   TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts
-  # Release version has to start with real version (7.3.0-....) for the docker image to build successfully.
-  RELEASE_VERSION: 7.2.2
-  DEVELOPMENT_VERSION: 7.2.3-A2-SNAPSHOT
+    # Release version has to start with real version (7.2.3-....) for the docker image to build successfully.
+  RELEASE_VERSION: 7.2.3-A1
+  DEVELOPMENT_VERSION: 7.2.3-SNAPSHOT
 
 jobs:
   tas_tests:
diff --git a/dev/dev-acs-amps-overlay/pom.xml b/dev/dev-acs-amps-overlay/pom.xml
index 20a478707..ab70b1136 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/dev/dev-repo-amps-overlay/pom.xml b/dev/dev-repo-amps-overlay/pom.xml
index 985193dce..7804f73de 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/dev/dev-share-amps-overlay/pom.xml b/dev/dev-share-amps-overlay/pom.xml
index 28c131e6a..ab73caed0 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/dev/dev-tomcat/pom.xml b/dev/dev-tomcat/pom.xml
index 6327a16b5..2823e992c 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/dev/pom.xml b/dev/pom.xml
index d0d28e7ee..ffe1c0d7c 100644
--- a/dev/pom.xml
+++ b/dev/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/distribution-ags/pom.xml b/distribution-ags/pom.xml
index 70bb78c41..ac696384e 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 8f6706d63..5469de14c 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/docker-alfresco/ags/pom.xml b/docker-alfresco/ags/pom.xml
index 61d3db539..1bd43f661 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>7.2.3-A2-SNAPSHOT</version>
+      <version>7.2.3-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index 12cdd3035..216da6ea1 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/docker-share/ags/pom.xml b/docker-share/ags/pom.xml
index 7490e960e..53bbe6cbf 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>7.2.3-A2-SNAPSHOT</version>
+      <version>7.2.3-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/docker-share/pom.xml b/docker-share/pom.xml
index 74888c6db..e9c82288d 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>7.2.3-A2-SNAPSHOT</version>
+      <version>7.2.3-SNAPSHOT</version>
    </parent>
 </project>
diff --git a/pom.xml b/pom.xml
index dfd79038c..fa167a697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@
     <artifactId>acs-community-packaging</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>7.2.3-A2-SNAPSHOT</version>
+    <version>7.2.3-SNAPSHOT</version>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
         <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-        <version>16.21</version>
+        <version>17.1</version>
     </parent>
 
     <properties>
-        <dependency.alfresco-community-repo.version>16.21</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>16.22</dependency.alfresco-community-share.version>
+        <dependency.alfresco-community-repo.version>17.1</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>17.1</dependency.alfresco-community-share.version>
         <dependency.acs-packaging.version>7.2.2</dependency.acs-packaging.version> <!-- for Share distribution zip -->
 
         <repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml
index a231aa048..86a8505e5 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index e88a21f8a..4d4992bab 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/tests/tas-cmis/pom.xml b/tests/tas-cmis/pom.xml
index 2275b6bb4..0bf5a58e9 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-distribution-zip/pom.xml b/tests/tas-distribution-zip/pom.xml
index f8f7eebfc..663dbcc76 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>7.2.3-A2-SNAPSHOT</version>
+    <version>7.2.3-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/tests/tas-email/pom.xml b/tests/tas-email/pom.xml
index 16b96bfdb..bbe46bb2c 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-integration/pom.xml b/tests/tas-integration/pom.xml
index 0f79dab5d..6f139a8d3 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-restapi/pom.xml b/tests/tas-restapi/pom.xml
index 80f7fc3d6..5e817d8e1 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-webdav/pom.xml b/tests/tas-webdav/pom.xml
index 9425c910a..53c1f16fe 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>7.2.3-A2-SNAPSHOT</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <developers>