diff --git a/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml b/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
index 8827a1e1..07e6dfa0 100755
--- a/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
@@ -1,4 +1,4 @@
-<datasources-configuration>
+<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
     <providers>
         <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
     </providers>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js
index db2d6110..176aef7c 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js
@@ -87,6 +87,36 @@ utility = function () {
             key: "devices/operation",
             name: "Perform Operation"
         }], "device-mgt/user", "init");
+
+        // Group Management Permissions
+        userModule.addPermissions([{
+            key: "groups/monitor",
+            name: "Monitor Devices in Group"
+        }], "group-mgt/user", "init");
+        userModule.addPermissions([{
+            key: "groups/operation",
+            name: "Perform Device Operation"
+        }], "group-mgt/user", "init");
+        userModule.addPermissions([{
+            key: "groups/add_devices",
+            name: "Add Devices to Group"
+        }], "group-mgt/user", "init");
+        userModule.addPermissions([{
+            key: "groups/remove_devices",
+            name: "Remove Devices from Group"
+        }], "group-mgt/user", "init");
+        userModule.addPermissions([{
+            key: "groups/modify",
+            name: "Modify Group"
+        }], "group-mgt/user", "init");
+        userModule.addPermissions([{
+            key: "groups/share",
+            name: "Change Group Sharing"
+        }], "group-mgt/user", "init");
+        userModule.addPermissions([{
+            key: "groups/delete",
+            name: "Delete Group"
+        }], "group-mgt/user", "init");
     };
 
     return publicMethods;
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 833551ef..b5635113 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -339,7 +339,7 @@
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.user.server.feature.group</id>
+                                    <id>org.wso2.carbon.device.mgt.group.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
                                 <feature>