diff --git a/openidm-audit/pom.xml b/openidm-audit/pom.xml
index 11420a59..31987cac 100644
--- a/openidm-audit/pom.xml
+++ b/openidm-audit/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -35,17 +35,17 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-enhanced-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-repo</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-smartevent</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-config/pom.xml b/openidm-config/pom.xml
index 323c98ae..097f0b34 100644
--- a/openidm-config/pom.xml
+++ b/openidm-config/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -35,12 +35,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-enhanced-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-repo</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-core/pom.xml b/openidm-core/pom.xml
index 4bc75b89..451b29ed 100644
--- a/openidm-core/pom.xml
+++ b/openidm-core/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -35,22 +35,22 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-enhanced-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-repo</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-quartz-fragment</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-smartevent</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-crypto/pom.xml b/openidm-crypto/pom.xml
index 45442a22..7f2701ec 100644
--- a/openidm-crypto/pom.xml
+++ b/openidm-crypto/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -35,7 +35,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-util</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-customendpoint/pom.xml b/openidm-customendpoint/pom.xml
index c263a6e3..96b9694d 100644
--- a/openidm-customendpoint/pom.xml
+++ b/openidm-customendpoint/pom.xml
@@ -27,17 +27,17 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-project</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
-    <groupId>org.forgerock.openidm-ce</groupId>
+    <groupId>org.forgerock.ce.openidm</groupId>
     <artifactId>openidm-customendpoint</artifactId>
     <name>OpenIDM Custom Endpoints Service</name>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-core</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-enhanced-config/pom.xml b/openidm-enhanced-config/pom.xml
index 294cf14e..038f18a7 100644
--- a/openidm-enhanced-config/pom.xml
+++ b/openidm-enhanced-config/pom.xml
@@ -18,7 +18,7 @@
  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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -28,7 +28,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-crypto</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-external-email/pom.xml b/openidm-external-email/pom.xml
index 8e4103da..fc7e0ba1 100644
--- a/openidm-external-email/pom.xml
+++ b/openidm-external-email/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -35,7 +35,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-enhanced-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-external-rest/pom.xml b/openidm-external-rest/pom.xml
index c5953680..18f83088 100644
--- a/openidm-external-rest/pom.xml
+++ b/openidm-external-rest/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -35,7 +35,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-enhanced-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-filter/pom.xml b/openidm-filter/pom.xml
index 1d29f210..77662bfc 100644
--- a/openidm-filter/pom.xml
+++ b/openidm-filter/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -35,12 +35,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-core</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-httpcontext</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-httpcontext/pom.xml b/openidm-httpcontext/pom.xml
index fee95832..d2b27b4c 100644
--- a/openidm-httpcontext/pom.xml
+++ b/openidm-httpcontext/pom.xml
@@ -26,10 +26,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-project</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
-    <groupId>org.forgerock.openidm-ce</groupId>
+    <groupId>org.forgerock.ce.openidm</groupId>
     <artifactId>openidm-httpcontext</artifactId>
     <name>OpenIDM http context</name>
     <packaging>bundle</packaging>
diff --git a/openidm-infoservice/pom.xml b/openidm-infoservice/pom.xml
index ecffa171..9d0c524f 100644
--- a/openidm-infoservice/pom.xml
+++ b/openidm-infoservice/pom.xml
@@ -27,17 +27,17 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-project</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
-    <groupId>org.forgerock.openidm-ce</groupId>
+    <groupId>org.forgerock.ce.openidm</groupId>
     <artifactId>openidm-infoservice</artifactId>
     <name>OpenIDM Info Service</name>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-core</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-integration-tests/pom.xml b/openidm-integration-tests/pom.xml
index ee4d9c72..65f6c2a4 100644
--- a/openidm-integration-tests/pom.xml
+++ b/openidm-integration-tests/pom.xml
@@ -26,7 +26,7 @@
          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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -76,12 +76,12 @@
 
 
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>org.forgerock.json.resource</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>launcher</artifactId>
             <version>1.0.0</version>
             <scope>test</scope>
@@ -243,7 +243,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.forgerock.openidm-ce</groupId>
+                                    <groupId>org.forgerock.ce.openidm</groupId>
                                     <artifactId>openidm-zip</artifactId>
                                     <version>${openidm.version}</version>
                                     <type>zip</type>
diff --git a/openidm-jaas-loginmodule-repo/pom.xml b/openidm-jaas-loginmodule-repo/pom.xml
index 800c33e9..c6b2aba5 100644
--- a/openidm-jaas-loginmodule-repo/pom.xml
+++ b/openidm-jaas-loginmodule-repo/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -36,12 +36,12 @@
     <dependencies>
         <!-- CryptoService dependency -->
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-core</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-httpcontext</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-jetty-fragment/pom.xml b/openidm-jetty-fragment/pom.xml
index a132afc6..a79d9f04 100644
--- a/openidm-jetty-fragment/pom.xml
+++ b/openidm-jetty-fragment/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -34,14 +34,14 @@
     <packaging>bundle</packaging>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-crypto</artifactId>
             <version>${openidm.version}</version>
         </dependency>
 
 <!-- Not necessary when using dynamic import
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-jaas-loginmodule-repo</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-patch/pom.xml b/openidm-patch/pom.xml
index 251b1d76..013ccfff 100644
--- a/openidm-patch/pom.xml
+++ b/openidm-patch/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -34,117 +34,106 @@
     <packaging>pom</packaging>
     <repositories>
         <repository>
-            <id>forgerock-staging-repository</id>
-            <name>ForgeRock Release Repository</name>
-            <url>http://maven.forgerock.org/repo/releases</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>forgerock-snapshots-repository</id>
-            <name>ForgeRock Snapshot Repository</name>
-            <url>http://maven.forgerock.org/repo/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
+            <id>forgerock-community-repository</id>
+            <name>ForgeRock Community Repository</name>
+            <url>http://maven.forgerock.org/repo/community</url>
         </repository>
     </repositories>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-audit</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-shell</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-external-rest</artifactId>
             <version>${openidm.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-external-email</artifactId>
             <version>${openidm.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-jaas-loginmodule-repo</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-jetty-fragment</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-policy</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-provisioner-openicf</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-repo-orientdb</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-repo-jdbc</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-restlet</artifactId>
             <version>${openidm.version}</version>
         </dependency>
          <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-filter</artifactId>
             <version>${openidm.version}</version>
         </dependency>
          <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-servletfilter-registrator</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-scheduler</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-infoservice</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-customendpoint</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-security-jetty</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-ui</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-smartevent</artifactId>
             <version>${openidm.version}</version>
             <!-- To satisfy both maven unit tests and OSGi packaging
@@ -158,18 +147,18 @@
             </exclusions> 
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-workflow-activiti</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-workflow-remote</artifactId>
             <version>${openidm.version}</version>
             <type>war</type>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-workflow-activiti</artifactId>
             <version>${openidm.version}</version>
             <classifier>jar-with-dependencies</classifier>
@@ -191,7 +180,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.forgerock.openidm-ce</groupId>
+                                    <groupId>org.forgerock.ce.openidm</groupId>
                                     <artifactId>openidm-zip</artifactId>
                                     <version>${openidm.version}</version>
                                     <type>zip</type>
diff --git a/openidm-policy/pom.xml b/openidm-policy/pom.xml
index c0c1c1b6..a119c375 100644
--- a/openidm-policy/pom.xml
+++ b/openidm-policy/pom.xml
@@ -27,17 +27,17 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-project</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
-    <groupId>org.forgerock.openidm-ce</groupId>
+    <groupId>org.forgerock.ce.openidm</groupId>
     <artifactId>openidm-policy</artifactId>
     <name>OpenIDM Policy Service</name>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-core</artifactId>
             <version>${openidm.version}</version>
         </dependency>
@@ -65,7 +65,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-util</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-provisioner-openicf/pom.xml b/openidm-provisioner-openicf/pom.xml
index 7f3ce4a7..59fc2cec 100644
--- a/openidm-provisioner-openicf/pom.xml
+++ b/openidm-provisioner-openicf/pom.xml
@@ -26,10 +26,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-project</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
-    <groupId>org.forgerock.openidm-ce</groupId>
+    <groupId>org.forgerock.ce.openidm</groupId>
     <artifactId>openidm-provisioner-openicf</artifactId>
     <name>OpenIDM provisioner using OpenICF</name>
     <packaging>bundle</packaging>
@@ -39,32 +39,32 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-core</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-provisioner</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-smartevent</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openicf.framework</groupId>
+            <groupId>org.forgerock.ce.openicf.framework</groupId>
             <artifactId>connector-framework-osgi</artifactId>
             <version>1.1.1.0</version>
             <exclusions>
                 <exclusion>
-                    <groupId>org.forgerock.openicf.framework</groupId>
+                    <groupId>org.forgerock.ce.openicf.framework</groupId>
                     <artifactId>connector-test-common</artifactId>
                 </exclusion>
             </exclusions>
@@ -93,7 +93,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openicf.framework</groupId>
+            <groupId>org.forgerock.ce.openicf.framework</groupId>
             <artifactId>connector-test-common</artifactId>
             <version>1.1.1.0</version>
             <scope>test</scope>
@@ -158,37 +158,37 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.forgerock.openicf.connectors.file</groupId>
+                                    <groupId>org.forgerock.ce.openicf.connectors.file</groupId>
                                     <artifactId>openicf-xml-connector</artifactId>
                                     <version>1.1.0.0</version>
                                     <type>bundle</type>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.forgerock.openicf.connectors.ldap</groupId>
+                                    <groupId>org.forgerock.ce.openicf.connectors.ldap</groupId>
                                     <artifactId>openicf-ldap-connector</artifactId>
                                     <version>1.1.0.0</version>
                                     <type>bundle</type>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.forgerock.openicf.connectors.os</groupId>
+                                    <groupId>org.forgerock.ce.openicf.connectors.os</groupId>
                                     <artifactId>openicf-solaris-connector</artifactId>
                                     <version>1.1.0.0-EA</version>
                                     <type>bundle</type>
                                 </artifactItem>
                                 <!--artifactItem>
-                                    <groupId>org.forgerock.openicf.connectors.os</groupId>
+                                    <groupId>org.forgerock.ce.openicf.connectors.os</groupId>
                                     <artifactId>openicf-vms-connector</artifactId>
                                     <version>1.1.0.0</version>
                                     <type>bundle</type>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.forgerock.openicf.connectors.db</groupId>
+                                    <groupId>org.forgerock.ce.openicf.connectors.db</groupId>
                                     <artifactId>openicf-databasetable-connector</artifactId>
                                     <version>1.1.0.0</version>
                                     <type>bundle</type>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.forgerock.openicf.connectors.db</groupId>
+                                    <groupId>org.forgerock.ce.openicf.connectors.db</groupId>
                                     <artifactId>openicf-mysqluser-connector</artifactId>
                                     <version>1.1.0.0</version>
                                     <type>bundle</type>
@@ -208,12 +208,12 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.forgerock.openicf.framework</groupId>
+                                    <groupId>org.forgerock.ce.openicf.framework</groupId>
                                     <artifactId>connector-framework</artifactId>
                                     <version>1.1.1.0</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.forgerock.openicf.framework</groupId>
+                                    <groupId>org.forgerock.ce.openicf.framework</groupId>
                                     <artifactId>connector-framework-internal</artifactId>
                                     <version>1.1.1.0</version>
                                 </artifactItem>
diff --git a/openidm-provisioner/pom.xml b/openidm-provisioner/pom.xml
index 592712bc..373b50c0 100644
--- a/openidm-provisioner/pom.xml
+++ b/openidm-provisioner/pom.xml
@@ -26,10 +26,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-project</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
-    <groupId>org.forgerock.openidm-ce</groupId>
+    <groupId>org.forgerock.ce.openidm</groupId>
     <artifactId>openidm-provisioner</artifactId>
     <name>OpenIDM provisioner</name>
     <description>The provisioner provides the CRUD functionality for system objects.</description>
@@ -40,12 +40,12 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-quartz-fragment</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>json-schema</artifactId>
         </dependency>
         <dependency>
diff --git a/openidm-quartz-fragment/pom.xml b/openidm-quartz-fragment/pom.xml
index e7f4f6b9..965647fe 100644
--- a/openidm-quartz-fragment/pom.xml
+++ b/openidm-quartz-fragment/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -35,12 +35,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-enhanced-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-repo</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-repo-jdbc/pom.xml b/openidm-repo-jdbc/pom.xml
index ea84dcc2..31e29b1d 100644
--- a/openidm-repo-jdbc/pom.xml
+++ b/openidm-repo-jdbc/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -37,17 +37,17 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-core</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-smartevent</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-repo-orientdb/pom.xml b/openidm-repo-orientdb/pom.xml
index 51fc4701..db774657 100644
--- a/openidm-repo-orientdb/pom.xml
+++ b/openidm-repo-orientdb/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -37,17 +37,17 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-core</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-smartevent</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-repo/pom.xml b/openidm-repo/pom.xml
index 063c2bbb..debbcbef 100644
--- a/openidm-repo/pom.xml
+++ b/openidm-repo/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -34,7 +34,7 @@
     <packaging>bundle</packaging>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-util</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-restlet/pom.xml b/openidm-restlet/pom.xml
index 0b9f4d18..13536191 100644
--- a/openidm-restlet/pom.xml
+++ b/openidm-restlet/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -34,12 +34,12 @@
     <packaging>bundle</packaging>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-core</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-servletfilter-registrator</artifactId>
             <version>${openidm.version}</version>
         </dependency>
@@ -54,20 +54,20 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>org.forgerock.json.resource.restlet</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>org.forgerock.restlet</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-httpcontext</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-util</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-scheduler/pom.xml b/openidm-scheduler/pom.xml
index 0ef07fe1..114936a7 100644
--- a/openidm-scheduler/pom.xml
+++ b/openidm-scheduler/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -35,12 +35,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-enhanced-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-quartz-fragment</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-security-jetty/pom.xml b/openidm-security-jetty/pom.xml
index 0a379e74..14cd7430 100644
--- a/openidm-security-jetty/pom.xml
+++ b/openidm-security-jetty/pom.xml
@@ -26,22 +26,22 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-project</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
-    <groupId>org.forgerock.openidm-ce</groupId>
+    <groupId>org.forgerock.ce.openidm</groupId>
     <artifactId>openidm-security-jetty</artifactId>
     <name>OpenIDM fragment for jetty security</name>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-httpcontext</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-jetty-fragment</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-servletfilter-registrator/pom.xml b/openidm-servletfilter-registrator/pom.xml
index 8e942f0e..e2a1bcad 100644
--- a/openidm-servletfilter-registrator/pom.xml
+++ b/openidm-servletfilter-registrator/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -35,12 +35,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-core</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-httpcontext</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-shell/pom.xml b/openidm-shell/pom.xml
index 07eb5e9f..d82871d9 100644
--- a/openidm-shell/pom.xml
+++ b/openidm-shell/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -39,17 +39,17 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-core</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-external-rest</artifactId>
             <version>${openidm.version}</version>
         </dependency>
diff --git a/openidm-smartevent/pom.xml b/openidm-smartevent/pom.xml
index 1f8cc0e9..f8af42c0 100644
--- a/openidm-smartevent/pom.xml
+++ b/openidm-smartevent/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -59,7 +59,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>json-fluent</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/openidm-system/pom.xml b/openidm-system/pom.xml
index dc31733a..900faa85 100644
--- a/openidm-system/pom.xml
+++ b/openidm-system/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
diff --git a/openidm-ui-ria/openidm-ui-ria-admin/pom.xml b/openidm-ui-ria/openidm-ui-ria-admin/pom.xml
index c07b8509..1e29be96 100644
--- a/openidm-ui-ria/openidm-ui-ria-admin/pom.xml
+++ b/openidm-ui-ria/openidm-ui-ria-admin/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-ui-ria</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
 
diff --git a/openidm-ui-ria/openidm-ui-ria-apps/pom.xml b/openidm-ui-ria/openidm-ui-ria-apps/pom.xml
index ccd8544a..a8c1eb66 100644
--- a/openidm-ui-ria/openidm-ui-ria-apps/pom.xml
+++ b/openidm-ui-ria/openidm-ui-ria-apps/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-ui-ria</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
 
diff --git a/openidm-ui-ria/openidm-ui-ria-functional-tests/pom.xml b/openidm-ui-ria/openidm-ui-ria-functional-tests/pom.xml
index 5195b3d1..5974e106 100644
--- a/openidm-ui-ria/openidm-ui-ria-functional-tests/pom.xml
+++ b/openidm-ui-ria/openidm-ui-ria-functional-tests/pom.xml
@@ -29,7 +29,7 @@
 	<modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-ui-ria</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
 
diff --git a/openidm-ui-ria/pom.xml b/openidm-ui-ria/pom.xml
index 9a057d32..42361777 100644
--- a/openidm-ui-ria/pom.xml
+++ b/openidm-ui-ria/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-project</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
 
@@ -49,7 +49,7 @@
            <classifier>www</classifier>
         </dependency>
         <dependency>
-           <groupId>org.forgerock.openidm-ce</groupId>
+           <groupId>org.forgerock.ce.openidm</groupId>
            <artifactId>openidm-ui-ria-apps</artifactId>
            <version>${openidm.version}</version>
            <type>zip</type>
diff --git a/openidm-ui/pom.xml b/openidm-ui/pom.xml
index 95cf2eb5..03824292 100644
--- a/openidm-ui/pom.xml
+++ b/openidm-ui/pom.xml
@@ -26,10 +26,10 @@
     <modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>openidm-project</artifactId>
-		<groupId>org.forgerock.openidm-ce</groupId>
+		<groupId>org.forgerock.ce.openidm</groupId>
 		<version>2.1.2</version>
 	</parent>
-	<groupId>org.forgerock.openidm-ce</groupId>
+	<groupId>org.forgerock.ce.openidm</groupId>
 	<artifactId>openidm-ui</artifactId>
 	<name>OpenIDM Web UI</name>
 	<packaging>bundle</packaging>
@@ -61,7 +61,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-ui-ria-admin</artifactId>
             <version>${openidm.version}</version>
             <type>zip</type>
diff --git a/openidm-util/pom.xml b/openidm-util/pom.xml
index a58eb4c0..477afc16 100644
--- a/openidm-util/pom.xml
+++ b/openidm-util/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -37,28 +37,28 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>json-patch</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>json-crypto-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>org.forgerock.json.resource</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>org.forgerock.util</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-system</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-smartevent</artifactId>
             <version>${openidm.version}</version>
             <scope>provided</scope>
diff --git a/openidm-webapp/pom.xml b/openidm-webapp/pom.xml
index 34d813ac..3a004177 100644
--- a/openidm-webapp/pom.xml
+++ b/openidm-webapp/pom.xml
@@ -26,10 +26,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openidm-project</artifactId>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <version>2.1.2</version>
     </parent>
-    <groupId>org.forgerock.openidm-ce</groupId>
+    <groupId>org.forgerock.ce.openidm</groupId>
     <artifactId>openidm-webapp</artifactId>
     <packaging>war</packaging>
     <version>2.1.2</version>
@@ -89,42 +89,42 @@
 
         <!-- OpenIDM Dependencies -->
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-audit</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-crypto</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-repo-orientdb</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-repo-jdbc</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-provisioner-openicf</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-restlet</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-scheduler</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-ui</artifactId>
             <version>${openidm.version}</version>
         </dependency>
@@ -376,20 +376,9 @@
     <!-- Just to allow the standalone execution of the project -->
     <repositories>
         <repository>
-            <id>forgerock-staging-repository</id>
-            <name>ForgeRock Release Repository</name>
-            <url>http://maven.forgerock.org/repo/releases</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>forgerock-snapshots-repository</id>
-            <name>ForgeRock Snapshot Repository</name>
-            <url>http://maven.forgerock.org/repo/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
+            <id>forgerock-community-repository</id>
+            <name>ForgeRock Community Repository</name>
+            <url>http://maven.forgerock.org/repo/community</url>
         </repository>
     </repositories>
 </project>
diff --git a/openidm-workflow-activiti/pom.xml b/openidm-workflow-activiti/pom.xml
index a881a0c9..ab3d3a2a 100644
--- a/openidm-workflow-activiti/pom.xml
+++ b/openidm-workflow-activiti/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -55,7 +55,7 @@
     <dependencies>
         <!-- mvn versions:display-dependency-updates -->
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-enhanced-config</artifactId>
             <version>${openidm.version}</version>
         </dependency>
@@ -228,7 +228,7 @@
                     <artifactId>org.restlet.ext.servlet</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>org.forgerock.commons</groupId>
+                    <groupId>org.forgerock.ce.commons</groupId>
                     <artifactId>json-fluent</artifactId>
                 </dependency>
                 <dependency>
diff --git a/openidm-workflow-remote/pom.xml b/openidm-workflow-remote/pom.xml
index 83716299..0b37513d 100644
--- a/openidm-workflow-remote/pom.xml
+++ b/openidm-workflow-remote/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -51,7 +51,7 @@
     <dependencies>
         <!-- mvn versions:display-dependency-updates -->
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-workflow-activiti</artifactId>
             <version>${openidm.version}</version>
         </dependency>
@@ -77,7 +77,7 @@
         </dependency>
         <!-- REST Dependencies-->
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>org.forgerock.json.resource.restlet</artifactId>
         </dependency>
         <dependency>
diff --git a/openidm-zip/pom.xml b/openidm-zip/pom.xml
index c2efecfa..9663e6e6 100644
--- a/openidm-zip/pom.xml
+++ b/openidm-zip/pom.xml
@@ -25,7 +25,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>
     <parent>
-        <groupId>org.forgerock.openidm-ce</groupId>
+        <groupId>org.forgerock.ce.openidm</groupId>
         <artifactId>openidm-project</artifactId>
         <version>2.1.2</version>
     </parent>
@@ -34,117 +34,106 @@
     <packaging>pom</packaging>
     <repositories>
         <repository>
-            <id>forgerock-staging-repository</id>
-            <name>ForgeRock Release Repository</name>
-            <url>http://maven.forgerock.org/repo/releases</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>forgerock-snapshots-repository</id>
-            <name>ForgeRock Snapshot Repository</name>
-            <url>http://maven.forgerock.org/repo/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
+            <id>forgerock-community-repository</id>
+            <name>ForgeRock Community Repository</name>
+            <url>http://maven.forgerock.org/repo/community</url>
         </repository>
     </repositories>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-audit</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-shell</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-external-rest</artifactId>
             <version>${openidm.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-external-email</artifactId>
             <version>${openidm.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-jaas-loginmodule-repo</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-jetty-fragment</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-policy</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-provisioner-openicf</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-repo-orientdb</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-repo-jdbc</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-restlet</artifactId>
             <version>${openidm.version}</version>
         </dependency>
          <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-filter</artifactId>
             <version>${openidm.version}</version>
         </dependency>
          <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-servletfilter-registrator</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-scheduler</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-infoservice</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-customendpoint</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-security-jetty</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-ui</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-smartevent</artifactId>
             <version>${openidm.version}</version>
             <!-- To satisfy both maven unit tests and OSGi packaging
@@ -158,18 +147,18 @@
             </exclusions> 
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-workflow-activiti</artifactId>
             <version>${openidm.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-workflow-remote</artifactId>
             <version>${openidm.version}</version>
             <type>war</type>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openidm-ce</groupId>
+            <groupId>org.forgerock.ce.openidm</groupId>
             <artifactId>openidm-workflow-activiti</artifactId>
             <version>${openidm.version}</version>
             <classifier>jar-with-dependencies</classifier>
@@ -325,7 +314,7 @@
 
         <!-- ForgeRock commons -->
         <dependency>
-            <groupId>org.forgerock.commons</groupId>
+            <groupId>org.forgerock.ce.commons</groupId>
             <artifactId>launcher-zip</artifactId>
             <version>1.0.0</version>
             <type>zip</type>
diff --git a/pom.xml b/pom.xml
index 19e7a0c2..f5bd6a6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,11 +25,11 @@
 <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>
     <parent>
-        <groupId>org.forgerock</groupId>
+        <groupId>org.forgerock.ce</groupId>
         <artifactId>forgerock-parent</artifactId>
         <version>1.1.0</version>
     </parent>
-    <groupId>org.forgerock.openidm-ce</groupId>
+    <groupId>org.forgerock.ce.openidm</groupId>
     <artifactId>openidm-project</artifactId>
     <version>2.1.2</version>
     <packaging>pom</packaging>
@@ -74,21 +74,13 @@
     <!-- NOT ALLOWED: (see FAQ at http://maven.apache.org/guides/mini/guide-central-repository-upload.html ) -->
     <repositories>
         <repository>
-            <id>forgerock-staging-repository</id>
-            <name>ForgeRock Release Repository</name>
-            <url>http://maven.forgerock.org/repo/releases</url>
+            <id>forgerock-community-repository</id>
+            <name>ForgeRock Community Repository</name>
+            <url>http://maven.forgerock.org/repo/community</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>forgerock-snapshots-repository</id>
-            <name>ForgeRock Snapshot Repository</name>
-            <url>http://maven.forgerock.org/repo/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
         <repository>
             <id>maven2-repository.dev.java.net</id>
             <name>Java.net Repository for Maven</name>
@@ -344,47 +336,47 @@
 
             <!-- ForgeRock Commons -->
             <dependency>
-                <groupId>org.forgerock.commons</groupId>
+                <groupId>org.forgerock.ce.commons</groupId>
                 <artifactId>json-fluent</artifactId>
                 <version>${commons.json-fluent.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.commons</groupId>
+                <groupId>org.forgerock.ce.commons</groupId>
                 <artifactId>json-patch</artifactId>
                 <version>${commons.json-patch.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.commons</groupId>
+                <groupId>org.forgerock.ce.commons</groupId>
                 <artifactId>json-crypto-core</artifactId>
                 <version>${commons.json-crypto.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.commons</groupId>
+                <groupId>org.forgerock.ce.commons</groupId>
                 <artifactId>json-crypto-cli</artifactId>
                 <version>${commons.json-crypto.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.commons</groupId>
+                <groupId>org.forgerock.ce.commons</groupId>
                 <artifactId>json-schema</artifactId>
                 <version>1.0.0</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.commons</groupId>
+                <groupId>org.forgerock.ce.commons</groupId>
                 <artifactId>org.forgerock.json.resource</artifactId>
                 <version>${commons.json-resource.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.commons</groupId>
+                <groupId>org.forgerock.ce.commons</groupId>
                 <artifactId>org.forgerock.util</artifactId>
                 <version>${commons.util.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.commons</groupId>
+                <groupId>org.forgerock.ce.commons</groupId>
                 <artifactId>org.forgerock.json.resource.restlet</artifactId>
                 <version>${commons.json-resource.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.commons</groupId>
+                <groupId>org.forgerock.ce.commons</groupId>
                 <artifactId>org.forgerock.restlet</artifactId>
                 <version>1.1.0</version>
             </dependency>
@@ -792,7 +784,7 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.forgerock.commons</groupId>
+                <groupId>org.forgerock.ce.commons</groupId>
                 <artifactId>forgerock-doc-maven-plugin</artifactId>
                 <version>2.1.5</version>
                 <inherited>false</inherited>