diff --git a/distribution/emm-community/pom.xml b/distribution/emm-community/pom.xml
index b188c27..3406971 100644
--- a/distribution/emm-community/pom.xml
+++ b/distribution/emm-community/pom.xml
@@ -20,7 +20,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">
 
     <parent>
-        <groupId>io.entgra.community</groupId>
+        <groupId>io.entgra.product</groupId>
         <artifactId>distribution</artifactId>
         <version>5.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml
index 6401e6b..f2dedb9 100644
--- a/distribution/iot-community/pom.xml
+++ b/distribution/iot-community/pom.xml
@@ -20,7 +20,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">
 
     <parent>
-        <groupId>io.entgra.community</groupId>
+        <groupId>io.entgra.product</groupId>
         <artifactId>distribution</artifactId>
         <version>5.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 5a019be..26f80b3 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -20,10 +20,9 @@
 <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">
 
     <parent>
-        <groupId>io.entgra.community</groupId>
-        <artifactId>community-parent</artifactId>
+        <groupId>io.entgra.product</groupId>
+        <artifactId>product-parent</artifactId>
         <version>5.0.1-SNAPSHOT</version>
-        <relativePath>${basedir}/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/iot-core/pom.xml b/iot-core/pom.xml
index e26724c..9628a3e 100644
--- a/iot-core/pom.xml
+++ b/iot-core/pom.xml
@@ -20,10 +20,9 @@
 
 <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">
     <parent>
-        <groupId>io.entgra.community</groupId>
-        <artifactId>community-parent</artifactId>
+        <groupId>io.entgra.product</groupId>
+        <artifactId>product-parent</artifactId>
         <version>5.0.1-SNAPSHOT</version>
-        <relativePath>${basedir}/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/p2-profile/emm/pom.xml b/p2-profile/emm/pom.xml
index 0347e55..dc65d14 100644
--- a/p2-profile/emm/pom.xml
+++ b/p2-profile/emm/pom.xml
@@ -20,7 +20,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">
 
     <parent>
-        <groupId>io.entgra.community</groupId>
+        <groupId>io.entgra.product</groupId>
         <artifactId>p2-profile</artifactId>
         <version>5.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -62,6 +62,7 @@
             <plugin>
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>2-p2-repo-generation</id>
diff --git a/p2-profile/iot/pom.xml b/p2-profile/iot/pom.xml
index b0620e9..0728d1d 100644
--- a/p2-profile/iot/pom.xml
+++ b/p2-profile/iot/pom.xml
@@ -20,7 +20,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">
 
     <parent>
-        <groupId>io.entgra.community</groupId>
+        <groupId>io.entgra.product</groupId>
         <artifactId>p2-profile</artifactId>
         <version>5.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml
index 4a9bb21..8b6c7aa 100644
--- a/p2-profile/pom.xml
+++ b/p2-profile/pom.xml
@@ -20,10 +20,9 @@
 <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>io.entgra.community</groupId>
-        <artifactId>community-parent</artifactId>
+        <groupId>io.entgra.product</groupId>
+        <artifactId>product-parent</artifactId>
         <version>5.0.1-SNAPSHOT</version>
-        <relativePath>${basedir}/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 01d63de..2610151 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.entgra.community</groupId>
-    <artifactId>community-parent</artifactId>
+    <groupId>io.entgra.product</groupId>
+    <artifactId>product-parent</artifactId>
     <packaging>pom</packaging>
     <version>5.0.1-SNAPSHOT</version>
     <name>Entgra Community Product - Parent</name>