diff --git a/docker/pom.xml b/docker/pom.xml
index 949a005e84..2b7c6fa0f6 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -1,12 +1,12 @@
 <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>content-services-community-docker-ea</artifactId>
+    <artifactId>content-services-community-docker</artifactId>
     <name>Alfresco Content Services Community Docker image builder</name>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging-ea</artifactId>
+        <artifactId>acs-community-packaging</artifactId>
         <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community-ea</artifactId>
+            <artifactId>content-services-community</artifactId>
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
@@ -52,7 +52,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>content-services-community-ea</artifactId>
+                                    <artifactId>content-services-community</artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
                                     <overWrite>false</overWrite>
diff --git a/pom.xml b/pom.xml
index 9eac02eeed..2d9a5fa25e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <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>acs-community-packaging-ea</artifactId>
+    <artifactId>acs-community-packaging</artifactId>
     <name>Alfresco Content Services Community Packaging</name>
     <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
diff --git a/war/pom.xml b/war/pom.xml
index 73ced7cfe8..58f62ea49a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -1,12 +1,12 @@
 <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>content-services-community-ea</artifactId>
+    <artifactId>content-services-community</artifactId>
     <name>Alfresco Content Services Community WAR</name>
     <packaging>war</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging-ea</artifactId>
+        <artifactId>acs-community-packaging</artifactId>
         <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/zip/pom.xml b/zip/pom.xml
index c9ba0a872c..be2030ba5b 100644
--- a/zip/pom.xml
+++ b/zip/pom.xml
@@ -1,13 +1,13 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-content-services-community-distribution-ea</artifactId>
+    <artifactId>alfresco-content-services-community-distribution</artifactId>
     <packaging>jar</packaging>
     <name>Alfresco Content Services Community WAR Installation</name>
 
     <parent>
         <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging-ea</artifactId>
+        <artifactId>acs-community-packaging</artifactId>
         <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -16,7 +16,7 @@
         <!-- WAR files -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community-ea</artifactId>
+            <artifactId>content-services-community</artifactId>
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community-ea</artifactId>
+            <artifactId>content-services-community</artifactId>
             <version>${project.version}</version>
             <classifier>classes</classifier>
         </dependency>