diff --git a/agent/pom.xml b/agent/pom.xml
index a569a7dc329..36ee8916246 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -22,14 +22,14 @@
   <artifactId>cloud-agent</artifactId>
   <name>Apache CloudStack Agents</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-core</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -39,7 +39,7 @@
       <version>6.1.26</version>
     </dependency>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-utils</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
diff --git a/api/pom.xml b/api/pom.xml
index f0ba16d3bfc..7f780949279 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -22,14 +22,14 @@
   <artifactId>cloud-api</artifactId>
   <name>Apache CloudStack API</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 045a62a17ae..45c6279edaf 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -23,7 +23,7 @@
   <version>4.0.0-SNAPSHOT</version>
   <name>Apache CloudStack AWS API Bridge</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
index 31f4e31e813..5abf1902127 100644
--- a/console-proxy/pom.xml
+++ b/console-proxy/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-console-proxy</artifactId>
   <name>Apache CloudStack Console Proxy</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
diff --git a/core/pom.xml b/core/pom.xml
index ec410887872..306cc1102f4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,19 +22,19 @@
   <artifactId>cloud-core</artifactId>
   <name>Apache CloudStack Core</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>xapi</artifactId>
       <version>${cs.xapi.version}</version>
       <exclusions>
diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml
index 1debfd6fd25..a0f18b1a99b 100644
--- a/deps/XenServerJava/pom.xml
+++ b/deps/XenServerJava/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>cloud-parent</artifactId>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
diff --git a/parent/pom.xml b/parent/pom.xml
index 7f1cfe317bb..1cf7b667b36 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -19,7 +19,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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml
index a643cf9f8aa..2a288a1836d 100644
--- a/plugins/deployment-planners/user-concentrated-pod/pom.xml
+++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-planner-user-concentrated-pod</artifactId>
   <name>Apache CloudStack Plugin - User Concentrated Pod Deployment Planner</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml
index d4d7095a78c..6321e94233c 100644
--- a/plugins/deployment-planners/user-dispersing/pom.xml
+++ b/plugins/deployment-planners/user-dispersing/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-planner-user-dispersing</artifactId>
   <name>Apache CloudStack Plugin - User Dispersing Deployment Planner</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/file-systems/netapp/pom.xml b/plugins/file-systems/netapp/pom.xml
index a5f024d48d3..6344f11cb58 100644
--- a/plugins/file-systems/netapp/pom.xml
+++ b/plugins/file-systems/netapp/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-netapp</artifactId>
   <name>Apache CloudStack Plugin - NetApp File System</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml
index 85d125bdf23..161e5db91ff 100644
--- a/plugins/host-allocators/random/pom.xml
+++ b/plugins/host-allocators/random/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-host-allocator-random</artifactId>
   <name>Apache CloudStack Plugin - Host Allocator Random</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index d01a2b20c7b..8d28b05dc9d 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -22,14 +22,14 @@
   <artifactId>cloud-plugin-hypervisor-kvm</artifactId>
   <name>Apache CloudStack Plugin - Hypervisor KVM</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-agent</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml
index cc480d7fae4..93783d407c2 100644
--- a/plugins/hypervisors/ovm/pom.xml
+++ b/plugins/hypervisors/ovm/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-hypervisor-ovm</artifactId>
   <name>Apache CloudStack Plugin - Hypervisor OracleVM</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
index f9f681ee03a..00748ca7e9f 100644
--- a/plugins/hypervisors/vmware/pom.xml
+++ b/plugins/hypervisors/vmware/pom.xml
@@ -22,14 +22,14 @@
   <artifactId>cloud-plugin-hypervisor-vmware</artifactId>
   <name>Apache CloudStack Plugin - Hypervisor VMware</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-vmware-base</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml
index 13ebeb5668b..f9376abdf57 100644
--- a/plugins/hypervisors/xen/pom.xml
+++ b/plugins/hypervisors/xen/pom.xml
@@ -22,14 +22,14 @@
   <artifactId>cloud-plugin-hypervisor-xen</artifactId>
   <name>Apache CloudStack Plugin - Hypervisor Xen</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-plugin-network-ovs</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml
index a50ad339add..d48669c3235 100644
--- a/plugins/network-elements/elastic-loadbalancer/pom.xml
+++ b/plugins/network-elements/elastic-loadbalancer/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-network-elb</artifactId>
   <name>Apache CloudStack Plugin - Network Elastic Load Balancer</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml
index 57e4ea53b8b..2a5058f0bb4 100644
--- a/plugins/network-elements/f5/pom.xml
+++ b/plugins/network-elements/f5/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-network-f5</artifactId>
   <name>Apache CloudStack Plugin - F5</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml
index d6c907f7b42..7d984e44b38 100644
--- a/plugins/network-elements/juniper-srx/pom.xml
+++ b/plugins/network-elements/juniper-srx/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-network-srx</artifactId>
   <name>Apache CloudStack Plugin - Juniper SRX</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/network-elements/midokura-midonet/pom.xml b/plugins/network-elements/midokura-midonet/pom.xml
index c6c0ec2f98e..f41cd5ed3b7 100644
--- a/plugins/network-elements/midokura-midonet/pom.xml
+++ b/plugins/network-elements/midokura-midonet/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-network-midonet</artifactId>
   <name>Apache CloudStack Plugin - Midokura Midonet</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml
index e0fcf7e51e4..e504009ba42 100644
--- a/plugins/network-elements/netscaler/pom.xml
+++ b/plugins/network-elements/netscaler/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-network-netscaler</artifactId>
   <name>Apache CloudStack Plugin - Network Netscaler</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
index 8db11ae72a4..0e4ded7f498 100644
--- a/plugins/network-elements/nicira-nvp/pom.xml
+++ b/plugins/network-elements/nicira-nvp/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-network-nvp</artifactId>
   <name>Apache CloudStack Plugin - Network Nicira NVP</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml
index 9385bb90a71..c93262f7f86 100644
--- a/plugins/network-elements/ovs/pom.xml
+++ b/plugins/network-elements/ovs/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-network-ovs</artifactId>
   <name>Apache CloudStack Plugin - Open vSwitch</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/parent/pom.xml b/plugins/parent/pom.xml
index 5fae41c3da4..2553d2c618a 100644
--- a/plugins/parent/pom.xml
+++ b/plugins/parent/pom.xml
@@ -23,14 +23,14 @@
   <name>Apache CloudStack Plugin POM</name>
   <packaging>pom</packaging>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-server</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index d6d31e47908..81eb20dd132 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -23,7 +23,7 @@
 	<name>Apache CloudStack Plugin POM</name>
 	<packaging>pom</packaging>
 	<parent>
-		<groupId>com.cloud</groupId>
+		<groupId>org.apache.cloudstack</groupId>
 		<artifactId>cloud-parent</artifactId>
 		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml
index 658bb195cca..3242dafc524 100644
--- a/plugins/storage-allocators/random/pom.xml
+++ b/plugins/storage-allocators/random/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-storage-allocator-random</artifactId>
   <name>Apache CloudStack Plugin - Storage Allocator Random</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index a904ee0c77d..b07cd7e3a2e 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-user-authenticator-ldap</artifactId>
   <name>Apache CloudStack Plugin - User Authenticator LDAP</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml
index c9173d7b752..8a679e0c8db 100644
--- a/plugins/user-authenticators/md5/pom.xml
+++ b/plugins/user-authenticators/md5/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-user-authenticator-md5</artifactId>
   <name>Apache CloudStack Plugin - User Authenticator MD5</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml
index 894b1b0b128..228d7baca7f 100644
--- a/plugins/user-authenticators/plain-text/pom.xml
+++ b/plugins/user-authenticators/plain-text/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-plugin-user-authenticator-plaintext</artifactId>
   <name>Apache CloudStack Plugin - User Authenticator Plain Text</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-plugin-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../parent/pom.xml</relativePath>
diff --git a/pom.xml b/pom.xml
index 3b7e8ff25c2..408e03d100c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <version>11</version>
   </parent>
 
-  <groupId>com.cloud</groupId>
+  <groupId>org.apache.cloudstack</groupId>
   <artifactId>cloudstack</artifactId>
   <version>4.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
diff --git a/server/pom.xml b/server/pom.xml
index 27ea99af42a..db89a5ceb50 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -22,14 +22,14 @@
   <artifactId>cloud-server</artifactId>
   <name>Apache CloudStack Server</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-core</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -60,9 +60,9 @@
       <artifactId>mail</artifactId>
       <version>${cs.mail.version}</version>
     </dependency>
-    <!-- <dependency> <groupId>com.cloud</groupId> <artifactId>cloud-utils</artifactId>
+    <!-- <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-utils</artifactId>
        <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope>
-       </dependency> <dependency> <groupId>com.cloud</groupId> <artifactId>cloud-agent</artifactId>
+       </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-agent</artifactId>
        <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope>
        </dependency> -->
   </dependencies>
diff --git a/usage/pom.xml b/usage/pom.xml
index 9bae8b135f8..142bc4fb140 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -22,14 +22,14 @@
   <artifactId>cloud-usage</artifactId>
   <name>Apache CloudStack Usage Server</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-server</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 7e85a510108..a6db5b2446e 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>cloud-utils</artifactId>
   <name>Apache CloudStack Utils</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index 5d262288694..0dc6c5923da 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -22,14 +22,14 @@
   <artifactId>cloud-vmware-base</artifactId>
   <name>Apache CloudStack VMware Base</name>
   <parent>
-    <groupId>com.cloud</groupId>
+    <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-parent</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <dependencies>
     <dependency>
-      <groupId>com.cloud</groupId>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-utils</artifactId>
       <version>${project.version}</version>
     </dependency>