diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/META-INF/permissions.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/META-INF/permissions.xml
index 89527545a..5f18e8f3a 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/META-INF/permissions.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/META-INF/permissions.xml
@@ -19,7 +19,7 @@
 
 <!-- This file contains the list of permissions that are associated with URL end points
     of the web app. Each permission should contain the name, permission path, API path
-    (URL) , HTTP method and authorization scope (OAuth2).
+    (URL) and HTTP method.
     When defining dynamic paths for APIs, path variables are denoted by '*' notation.
     For ex:
     Actual API endpoint: mdm-android-agent/1.0.0/operation/{device-id}
@@ -29,368 +29,266 @@
 -->
 <PermissionConfiguration>
     <APIVersion></APIVersion>
-    <!-- Operations management related permissions for admin -->
 
+    <!-- Configuration related permissions -->
 
     <Permission>
-        <name>Lock</name>
-        <path>/device-mgt/admin/operations/android/lock</path>
-        <url>/admin/devices/lock-devices</url>
-        <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
+        <name>View Tenant configuration</name>
+        <path>/device-mgt/admin/platform-configs/view</path>
+        <url>/configuration</url>
+        <method>GET</method>
     </Permission>
 
     <Permission>
-        <name>Unlock</name>
-        <path>/device-mgt/admin/operations/android/unlock</path>
-        <url>/admin/devices/unlock-devices</url>
+        <name>Add Tenant configuration</name>
+        <path>/device-mgt/admin/platform-configs/add</path>
+        <url>/configuration</url>
         <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
     </Permission>
 
     <Permission>
-        <name>Mute</name>
-        <path>/device-mgt/admin/operations/android/mute</path>
-        <url>/admin/devices/mute</url>
-        <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
+        <name>Enroll</name>
+        <path>/device-mgt/user/device/android/enroll</path>
+        <url>/configuration/license</url>
+        <method>GET</method>
     </Permission>
 
-    <Permission>
-        <name>Location</name>
-        <path>/device-mgt/admin/operations/android/location</path>
-        <url>/admin/devices/location</url>
-        <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
-    </Permission>
+    <!-- End of Configuration related permissions -->
 
-    <Permission>
-        <name>Clear Passcode</name>
-        <path>/device-mgt/admin/operations/android/clear-password</path>
-        <url>/admin/devices/clear-password</url>
-        <method>POST</method>
-        <scope>emm_admin</scope>
-    </Permission>
+    <!-- Device related permissions -->
 
     <Permission>
-        <name>Camera</name>
-        <path>/device-mgt/admin/operations/android/camera</path>
-        <url>/admin/devices/control-camera</url>
+        <name>Enroll</name>
+        <path>/device-mgt/user/device/android/enroll</path>
+        <url>/devices</url>
         <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
     </Permission>
 
     <Permission>
-        <name>Device Info</name>
-        <path>/device-mgt/admin/operations/android/device-info</path>
-        <url>/admin/devices/info</url>
-        <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
+        <name>Enroll</name>
+        <path>/device-mgt/user/device/android/enroll</path>
+        <url>/devices/*</url>
+        <method>DELETE</method>
     </Permission>
 
     <Permission>
-        <name>Enterprise Wipe</name>
-        <path>/device-mgt/admin/operations/android/enterprise-wipe</path>
-        <url>/admin/devices/enterprise-wipe</url>
-        <method>POST</method>
-        <scope>emm_admin</scope>
+        <name>Enroll</name>
+        <path>/device-mgt/user/device/android/enroll</path>
+        <url>/devices/*</url>
+        <method>PUT</method>
     </Permission>
 
     <Permission>
-        <name>Wipe Data</name>
-        <path>/device-mgt/admin/operations/android/wipe-data</path>
-        <url>/admin/devices/wipe</url>
-        <method>POST</method>
-        <scope>emm_admin</scope>
+        <name>Enroll</name>
+        <path>/device-mgt/user/device/android/enroll</path>
+        <url>/device/*/applications</url>
+        <method>PUT</method>
     </Permission>
 
     <Permission>
-        <name>Application List</name>
-        <path>/device-mgt/admin/operations/android/application-list</path>
-        <url>/admin/devices/applications</url>
-        <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
+        <name>Enroll</name>
+        <path>/device-mgt/user/device/android/enroll</path>
+        <url>/device/*/pending-operations</url>
+        <method>PUT</method>
     </Permission>
 
     <Permission>
-        <name>Ring</name>
-        <path>/device-mgt/admin/operations/android/ring-device</path>
-        <url>/admin/devices/ring</url>
-        <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
+        <name>Enroll</name>
+        <path>/device-mgt/user/device/android/enroll</path>
+        <url>/device/*/status</url>
+        <method>GET</method>
     </Permission>
 
-    <Permission>
-        <name>Reboot</name>
-        <path>/device-mgt/admin/operations/android/reboot-device</path>
-        <url>/admin/devices/reboot</url>
-        <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
-    </Permission>
+    <!-- End of device related permissions -->
 
-    <Permission>
-        <name>Upgrade Firmware</name>
-        <path>/device-mgt/admin/operations/android/upgrade-firmware</path>
-        <url>/admin/devices/upgrade-firmware</url>
-        <method>POST</method>
-        <scope>emm_admin</scope>
-    </Permission>
+    <!-- Event related permissions -->
 
     <Permission>
-        <name>Configure VPN</name>
-        <path>/device-mgt/admin/operations/android/vpn</path>
-        <url>/admin/devices/configure-vpn</url>
+        <name>Enroll</name>
+        <path>/device-mgt/user/device/android/enroll</path>
+        <url>/events/publish</url>
         <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
     </Permission>
 
     <Permission>
-        <name>Install Application</name>
-        <path>/device-mgt/android/operations/install-application</path>
-        <url>/admin/devices/install-application</url>
+        <name>View Events</name>
+        <path>/device-mgt/admin/events/view</path>
+        <url>/events/publish</url>
         <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
     </Permission>
 
-    <Permission>
-        <name>Update Application</name>
-        <path>/device-mgt/admin/operations/android/install-application</path>
-        <url>/admin/devices/update-application</url>
-        <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
-    </Permission>
+    <!-- End of event related permissions -->
+
+    <!-- Operations related permissions -->
 
     <Permission>
-        <name>Uninstall Application</name>
-        <path>/device-mgt/admin/operations/android/uninstall-application</path>
-        <url>/admin/devices/uninstall-application</url>
+        <name>Get installed applications</name>
+        <path>/device-mgt/admin/device/android/operation/get-installed-applications</path>
+        <url>/admin/devices/applications</url>
         <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
     </Permission>
 
     <Permission>
-        <name>Blacklist Applications</name>
-        <path>/device-mgt/admin/operations/android/blacklist-applications</path>
+        <name>Blacklist applications</name>
+        <path>/device-mgt/admin/device/android/operation/blacklist-applications</path>
         <url>/admin/devices/blacklist-applications</url>
         <method>POST</method>
-        <scope>emm_admin</scope>
     </Permission>
 
     <Permission>
-        <name>Notification</name>
-        <path>/device-mgt/admin/operations/android/notification</path>
-        <url>/admin/devices/send-notification</url>
+        <name>Change lock code</name>
+        <path>/device-mgt/admin/device/android/operation/change-lock-code</path>
+        <url>/admin/devices/change-lock-code</url>
         <method>POST</method>
-        <scope>emm_admin,emm_user</scope>
     </Permission>
 
     <Permission>
-        <name>Wifi</name>
-        <path>/device-mgt/admin/operations/android/wifi</path>
-        <url>/admin/devices/configure-wifi</url>
+        <name>Clear password</name>
+        <path>/device-mgt/admin/device/android/operation/clear-password</path>
+        <url>/admin/devices/clear-password</url>
         <method>POST</method>
-        <scope>emm_admin</scope>
     </Permission>
 
     <Permission>
-        <name>Encryption</name>
-        <path>/device-mgt/admin/operations/android/encrypt</path>
-        <url>/admin/devices/encrypt-storage</url>
+        <name>Configure VPN</name>
+        <path>/device-mgt/admin/device/android/operation/configure-vpn</path>
+        <url>/admin/devices/configure-vpn</url>
         <method>POST</method>
-        <scope>emm_admin</scope>
     </Permission>
 
     <Permission>
-        <name>Change lock code</name>
-        <path>/device-mgt/admin/operations/android/change-lock-code</path>
-        <url>/admin/devices/change-lock-code</url>
+        <name>Configure WiFi</name>
+        <path>/device-mgt/admin/device/android/operation/configure-wifi</path>
+        <url>/admin/devices/configure-wifi</url>
         <method>POST</method>
-        <scope>emm_admin</scope>
     </Permission>
 
     <Permission>
-        <name>Password Policy</name>
-        <path>/device-mgt/admin/operations/android/password-policy</path>
-        <url>/admin/devices/set-password-policy</url>
+        <name>Control camera</name>
+        <path>/device-mgt/admin/device/android/operation/control-camera</path>
+        <url>/admin/devices/control-camera</url>
         <method>POST</method>
-        <scope>emm_admin</scope>
     </Permission>
 
     <Permission>
-        <name>Webclip</name>
-        <path>/device-mgt/admin/operations/android/webclip</path>
-        <url>/admin/devices/set-webclip</url>
+        <name>Encrypt storage</name>
+        <path>/device-mgt/admin/device/android/operation/encrypt-storage</path>
+        <url>/admin/devices/encrypt-storage</url>
         <method>POST</method>
-        <scope>emm_admin</scope>
     </Permission>
 
     <Permission>
-        <name>Disenroll</name>
-        <path>/device-mgt/admin/operations/android/disenroll</path>
-        <url>/operation/disenroll</url>
+        <name>Enterprise wipe</name>
+        <path>/device-mgt/admin/device/android/operation/enterprise-wipe</path>
+        <url>/admin/devices/enterprise-wipe</url>
         <method>POST</method>
-        <scope>emm_android_agent</scope>
-    </Permission>
-
-    <!-- Device management related permissions -->
-    <Permission>
-        <name>View devices</name>
-        <path>/device-mgt/admin/devices/view</path>
-        <url>/device</url>
-        <method>GET</method>
-        <scope>emm_admin</scope>
     </Permission>
 
     <Permission>
-        <name>View device</name>
-        <path>/device-mgt/admin/devices/view</path>
-        <url>/device/*</url>
-        <method>GET</method>
-        <scope>emm_admin,emm_user</scope>
-    </Permission>
-
-    <Permission>
-        <name>Update device</name>
-        <path>/device-mgt/admin/devices/update</path>
-        <url>/device/*</url>
-        <method>PUT</method>
-        <scope>emm_admin,emm_user</scope>
-    </Permission>
-
-    <Permission>
-        <name>Update application list</name>
-        <path>/device-mgt/admin/operations/android/update-applist</path>
-        <url>/device/appList/*</url>
+        <name>Get device info</name>
+        <path>/device-mgt/admin/device/android/operation/get-info</path>
+        <url>/admin/devices/info/url>
         <method>POST</method>
-        <scope>emm_admin</scope>
     </Permission>
 
     <Permission>
-        <name>View license</name>
-        <path>/device-mgt/user/enroll/android</path>
-        <url>/configuration/license</url>
-        <method>GET</method>
-        <scope>emm_android_agent</scope>
+        <name>Install application</name>
+        <path>/device-mgt/admin/device/android/operation/install-application</path>
+        <url>/admin/devices/install-application</url>
+        <method>POST</method>
     </Permission>
 
-    <!-- Enrollment related permissions -->
     <Permission>
-        <name>Enroll device</name>
-        <path>/device-mgt/user/enroll/android</path>
-        <url>/devices</url>
+        <name>Get location details</name>
+        <path>/device-mgt/admin/device/android/operation/location</path>
+        <url>/admin/devices/location</url>
         <method>POST</method>
-        <scope>emm_android_agent</scope>
     </Permission>
 
     <Permission>
-        <name>Devices related Operations</name>
-        <path>/device-mgt/user/enroll/android</path>
-        <url>/devices/*</url>
-        <method>GET</method>
-        <scope>emm_android_agent</scope>
+        <name>Lock device</name>
+        <path>/device-mgt/admin/device/android/operation/lock-device</path>
+        <url>/admin/devices/lock-devices</url>
+        <method>POST</method>
     </Permission>
 
     <Permission>
-        <name>Device is enrolled</name>
-        <path>/device-mgt/user/enroll/android</path>
-        <url>/devices/*/status</url>
-        <method>GET</method>
-        <scope>emm_android_agent</scope>
+        <name>Mute device</name>
+        <path>/device-mgt/admin/device/android/operation/mute</path>
+        <url>/admin/devices/mute</url>
+        <method>POST</method>
     </Permission>
 
     <Permission>
-        <name>Devices related Operations</name>
-        <path>/device-mgt/user/enroll/android</path>
-        <url>/devices/*/pending-operations</url>
-        <method>PUT</method>
-        <scope>emm_android_agent</scope>
+        <name>Reboot device</name>
+        <path>/device-mgt/admin/device/android/operation/reboot</path>
+        <url>/admin/devices/reboot</url>
+        <method>POST</method>
     </Permission>
 
     <Permission>
-        <name>Modify devices</name>
-        <path>/device-mgt/user/enroll/android</path>
-        <url>/devices/*</url>
-        <method>PUT</method>
-        <scope>emm_android_agent</scope>
+        <name>Ring device</name>
+        <path>/device-mgt/admin/device/android/operation/ring</path>
+        <url>/admin/devices/ring</url>
+        <method>POST</method>
     </Permission>
 
     <Permission>
-        <name>Delete devices</name>
-        <path>/device-mgt/user/enroll/android</path>
-        <url>/devices/*</url>
-        <method>DELETE</method>
-        <scope>emm_android_agent</scope>
+        <name>Send notification</name>
+        <path>/device-mgt/admin/device/android/operation/send-notification</path>
+        <url>/admin/devices/send-notification</url>
+        <method>POST</method>
     </Permission>
 
     <Permission>
-        <name>Update Enrollment</name>
-        <path>/device-mgt/android/devices/enroll</path>
-        <url>/enrollment/*</url>
-        <method>PUT</method>
-        <scope>emm_user,emm_admin</scope>
+        <name>Set password policy</name>
+        <path>/device-mgt/admin/device/android/operation/set-password-policy</path>
+        <url>/admin/devices/set-password-policy</url>
+        <method>POST</method>
     </Permission>
 
     <Permission>
-        <name>Disenroll device</name>
-        <path>/device-mgt/android/devices/enroll</path>
-        <url>/enrollment/*</url>
-        <method>DELETE</method>
-        <scope>emm_user,emm_admin</scope>
+        <name>Set web clip</name>
+        <path>/device-mgt/admin/device/android/operation/set-webclip</path>
+        <url>/admin/devices/set-webclip</url>
+        <method>POST</method>
     </Permission>
 
-    <!-- Policy related permissions -->
     <Permission>
-        <name>View Policies</name>
-        <path>/device-mgt/user/enroll/android</path>
-        <url>/policy/*</url>
-        <method>GET</method>
-        <scope>emm_admin</scope>
+        <name>Uninstall application</name>
+        <path>/device-mgt/admin/device/android/operation/uninstall-application</path>
+        <url>/admin/devices/uninstall-application</url>
+        <method>POST</method>
     </Permission>
 
     <Permission>
-        <name>View Policy Features</name>
-        <path>/device-mgt/user/enroll/android</path>
-        <url>/policy/features/*</url>
-        <method>GET</method>
-        <scope>emm_admin</scope>
+        <name>Unlock device</name>
+        <path>/device-mgt/admin/device/android/operation/unlock-device</path>
+        <url>/admin/devices/unlock-devices</url>
+        <method>POST</method>
     </Permission>
 
-    <!-- Configuration related permissions -->
     <Permission>
-        <name>View Tenant configuration</name>
-        <path>/device-mgt/admin/platform-configs/view</path>
-        <url>/configuration</url>
-        <method>GET</method>
-        <scope>emm_admin</scope>
+        <name>Update applications</name>
+        <path>/device-mgt/admin/device/android/operation/update-application</path>
+        <url>/admin/devices/update-application</url>
+        <method>POST</method>
     </Permission>
 
     <Permission>
-        <name>Add Tenant configuration</name>
-        <path>/device-mgt/admin/platform-configs/add</path>
-        <url>/configuration</url>
+        <name>Upgrade firmware</name>
+        <path>/device-mgt/admin/device/android/operation/upgrade-firmware</path>
+        <url>/admin/devices/upgrade-firmware</url>
         <method>POST</method>
-        <scope>emm_admin</scope>
     </Permission>
 
     <Permission>
-        <name>Update Tenant configuration</name>
-        <path>/device-mgt/admin/platform-configs/modify</path>
-        <url>/configuration</url>
-        <method>PUT</method>
-        <scope>emm_admin</scope>
-    </Permission>
-    <Permission>
-        <name>Event Addition</name>
-        <path>/device-mgt/android/events/add</path>
-        <url>/events/publish</url>
+        <name>Wipe device</name>
+        <path>/device-mgt/admin/device/android/operation/wipe</path>
+        <url>/admin/devices/wipe</url>
         <method>POST</method>
-        <scope>emm_user,emm_admin</scope>
-    </Permission>
-    <Permission>
-        <name>Event Retrieve</name>
-        <path>/device-mgt/android/events/view</path>
-        <url>/events</url>
-        <method>GET</method>
-        <scope>emm_admin</scope>
     </Permission>
+
+    <!-- End of operation related permissions -->
+
 </PermissionConfiguration>
\ No newline at end of file