diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/META-INF/permissions.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/META-INF/permissions.xml
index 8718c827e0..b38133cc1f 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/META-INF/permissions.xml
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/META-INF/permissions.xml
@@ -33,7 +33,7 @@
     <Permission>
         <name>get certificate in the database</name>
         <path>/device-mgt/emm-admin/certificate/GetSignCSR</path>
-        <url>/certificates/signcsr</url>
+        <url>/certificates/scep/signcsr</url>
         <method>POST</method>
         <scope>emm_admin</scope>
     </Permission>
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/permissions.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/permissions.xml
index 480483adb4..dcd6b92155 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/permissions.xml
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/permissions.xml
@@ -29,38 +29,30 @@
 -->
 <PermissionConfiguration>
     <APIVersion></APIVersion>
-    <!-- Device related APIs -->
-    <Permission>
-        <name>get certificate in the database</name>
-        <path>/device-mgt/emm-admin/certificate/GetSignCSR</path>
-        <url>/certificates/sign-csr</url>
-        <method>POST</method>
-        <scope>emm_admin</scope>
-    </Permission>
 
     <!-- CertificateManagementAdminService related APIs -->
     <Permission>
         <name>Save certificate</name>
         <path>/device-mgt/admin/certificate/Save</path>
-        <url>/certificates</url>
+        <url>/admin/certificates</url>
         <method>POST</method>
     </Permission>
     <Permission>
         <name>Get certificate</name>
         <path>/device-mgt/admin/certificate/Get</path>
-        <url>/certificates/*</url>
+        <url>/admin/certificates/*</url>
         <method>GET</method>
     </Permission>
     <Permission>
         <name>Get all certificates</name>
         <path>/device-mgt/admin/certificate/GetAll</path>
-        <url>/certificates</url>
+        <url>/admin/certificates</url>
         <method>GET</method>
     </Permission>
     <Permission>
         <name>Remove certificate</name>
         <path>/device-mgt/admin/certificate/Remove</path>
-        <url>/certificates/*</url>
+        <url>/admin/certificates/*</url>
         <method>DELETE</method>
     </Permission>
     <!-- End of CertificateManagementAdminService related APIs -->
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml
index 8797ebc6cb..4328808d68 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml
@@ -30,104 +30,7 @@
 <PermissionConfiguration>
     <APIVersion></APIVersion>
 
-    <!-- Activity related APIs -->
-    <Permission>
-        <name>Fetch Activity related details</name>
-        <path>/device-mgt/admin/activities/view</path>
-        <url>/activities/*</url>
-        <method>GET</method>
-    </Permission>
-    <Permission>
-        <name>Fetch Activity related details</name>
-        <path>/device-mgt/admin/activities/view</path>
-        <url>/activities</url>
-        <method>GET</method>
-    </Permission>
-    <!-- Activity related APIs -->
-    <!-- Device related APIs -->
-    <Permission>
-        <name>List devices</name>
-        <path>/device-mgt/admin/devices/list</path>
-        <url>/devices</url>
-        <method>GET</method>
-    </Permission>
-
-    <Permission>
-        <name>List device types</name>
-        <path>/device-mgt/admin/devices/list</path>
-        <url>/devices/types</url>
-        <method>GET</method>
-    </Permission>
-
-    <Permission>
-        <name>List device types</name>
-        <path>/device-mgt/user/devices/list</path>
-        <url>/devices/types</url>
-        <method>GET</method>
-    </Permission>
-
-    <Permission>
-        <name>Add policy</name>
-        <path>/device-mgt/admin/policies/add</path>
-        <url>/devices/types</url>
-        <method>GET</method>
-    </Permission>
-
-    <Permission>
-        <name>Add User policy</name>
-        <path>/device-mgt/user/policies/add</path>
-        <url>/devices/types</url>
-        <method>GET</method>
-    </Permission>
-
-    <Permission>
-        <name>Edit policy</name>
-        <path>/device-mgt/admin/policies/update</path>
-        <url>/devices/types</url>
-        <method>GET</method>
-    </Permission>
-
-    <Permission>
-        <name>Edit User policy</name>
-        <path>/device-mgt/user/policies/update</path>
-        <url>/devices/types</url>
-        <method>GET</method>
-    </Permission>
-
-    <Permission>
-        <name>View device</name>
-        <path>/device-mgt/admin/devices/view</path>
-        <url>/devices/view</url>
-        <method>GET</method>
-    </Permission>
-
-    <Permission>
-        <name>View user device</name>
-        <path>/device-mgt/user/devices/view</path>
-        <url>/devices/view</url>
-        <method>GET</method>
-    </Permission>
-
-    <Permission>
-        <name>Modify user device</name>
-        <path>/device-mgt/user/devices/update</path>
-        <url>/devices/type/*/id/*</url>
-        <method>PUT</method>
-    </Permission>
-
-    <Permission>
-        <name>Remove user device</name>
-        <path>/device-mgt/user/devices/remove</path>
-        <url>/devices/type/*/id/*</url>
-        <method>DELETE</method>
-    </Permission>
-
-
-
-
-
-
-
+    <!--Permission Tree Name-->
     <Permission>
         <name>Device Management</name>
         <path>/device-mgt</path>
@@ -239,51 +142,90 @@
         <url>/</url>
         <method>GET</method>
     </Permission>
+    <!--End of Permission Tree-->
 
-
-
-    <!--<Permission>-->
-        <!--<name>Get device</name>-->
-        <!--<path>/device-mgt/devices/view</path>-->
-        <!--<url>/devices/*/*</url>-->
-        <!--<method>GET</method>-->
-        <!--<scope>emm_admin,emm_user</scope>-->
-    <!--</Permission>-->
-
+    <!-- Activity related APIs -->
     <Permission>
-        <name>View device</name>
-        <path>/device-mgt/admin/devices/view</path>
-        <url>/devices/user/*/*</url>
+        <name>Fetch Activity related details</name>
+        <path>/device-mgt/admin/activities/view</path>
+        <url>/activities/*</url>
         <method>GET</method>
     </Permission>
-
     <Permission>
-        <name>Devices Count All</name>
+        <name>Fetch Activity related details</name>
+        <path>/device-mgt/admin/activities/view</path>
+        <url>/activities</url>
+        <method>GET</method>
+    </Permission>
+    <!-- Activity related APIs -->
+    <!-- Device related APIs -->
+    <Permission>
+        <name>List devices</name>
         <path>/device-mgt/admin/devices/list</path>
-        <url>/devices/count</url>
+        <url>/devices</url>
         <method>GET</method>
     </Permission>
-
     <Permission>
-        <name>Device Count</name>
-        <path>/device-mgt/user/devices/list</path>
-        <url>/devices/user/*/count</url>
+        <name>Retrieve device information</name>
+        <path>/device-mgt/admin/devices/list</path>
+        <url>/devices/*/*/info</url>
         <method>GET</method>
     </Permission>
-
     <Permission>
-        <name>List devices</name>
+        <name>Get device</name>
         <path>/device-mgt/admin/devices/list</path>
-        <url>/devices/name/*/*</url>
+        <url>/devices/*/*</url>
         <method>GET</method>
     </Permission>
-
     <Permission>
-        <name>List All Own Devices</name>
-        <path>/device-mgt/user/devices/list</path>
-        <url>/devices/user/*</url>
+        <name>Get device location</name>
+        <path>/device-mgt/admin/devices/list</path>
+        <url>/devices/*/*/location</url>
+        <method>GET</method>
+    </Permission>
+    <Permission>
+        <name>devices location</name>
+        <path>/device-mgt/admin/devices/list</path>
+        <url>/devices/locations</url>
+        <method>POST</method>
+    </Permission>
+    <Permission>
+        <name>Get devices feature</name>
+        <path>/device-mgt/admin/devices/list</path>
+        <url>/devices/*/*/features</url>
+        <method>GET</method>
+    </Permission>
+    <Permission>
+        <name>Search devices</name>
+        <path>/device-mgt/admin/devices/list</path>
+        <url>/devices/search-devices</url>
+        <method>POST</method>
+    </Permission>
+    <Permission>
+        <name>list device application</name>
+        <path>/device-mgt/admin/devices/list</path>
+        <url>/devices/*/*/applications</url>
         <method>GET</method>
     </Permission>
+    <Permission>
+        <name>list device operation</name>
+        <path>/device-mgt/admin/devices/list</path>
+        <url>/devices/*/*/operations</url>
+        <method>GET</method>
+    </Permission>
+    <Permission>
+        <name>list device effective-policy</name>
+        <path>/device-mgt/admin/devices/list</path>
+        <url>/devices/*/*/effective-policy</url>
+        <method>GET</method>
+    </Permission>
+    <Permission>
+        <name>list devices</name>
+        <path>/device-mgt/admin/devices/list</path>
+        <url>/admin/devices</url>
+        <method>GET</method>
+    </Permission>
+
     <!-- End of Device related APIs -->
 
     <!-- Notification related APIs -->
@@ -1033,5 +975,4 @@
         <method>GET</method>
     </Permission>
     <!-- End of Dashboard related APIs -->
-
 </PermissionConfiguration>