diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
index 5461cf3c0..936b353ac 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
@@ -76,7 +76,7 @@ import java.util.List;
                         name = "Un-enroll Device",
                         description = "Unregister an Windows device",
                         key = "perm:windows:disenroll",
-                        permissions = {"/device-mgt/devices/disenroll/windows"}
+                        permissions = {"/device-mgt/devices/owning-device/operations/windows/disenroll"}
                 ),
                 @Scope(
                         name = "Factory Reset",
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/config.json b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/config.json
index ed2bc42ca..f5d01d0d7 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/config.json
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/config.json
@@ -3,79 +3,46 @@
         "label": "Windows",
         "category": "mobile",
         "scopes" : [
-          "perm:windows:enroll"
+          "perm:windows:enroll",
+            "perm:windows:lock-devices",
+            "perm:windows:ring",
+            "perm:windows:wipe",
+            "perm:windows:lock-reset",
+            "perm:windows:reboot",
+            "perm:windows:location",
+            "perm:windows:disenroll"
         ],
         "analyticsEnabled": "false",
         "groupingEnabled": "false",
         "features": {
             "DEVICE_RING": {
-                "icon": "fw-dial-up"
+                "icon": "fw-dial-up",
+                "permission": "/device-mgt/devices/owning-device/operations/android/ring"
             },
             "DEVICE_LOCK": {
-                "icon": "fw-lock"
+                "icon": "fw-lock",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/lock"
             },
             "DEVICE_LOCATION": {
-                "icon": "fw-map-location"
-            },
-            "CLEAR_PASSWORD": {
-                "icon": "fw-clear"
+                "icon": "fw-map-location",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/location"
             },
             "DEVICE_REBOOT": {
-                "icon": "fw-refresh"
-            },
-            "UPGRADE_FIRMWARE": {
-                "icon": "fw-hardware",
-                "formParams": [
-                    {
-                        "type": "checkbox",
-                        "id": "immediate",
-                        "optional": true,
-                        "label": "Instant Upgrade",
-                        "helper": "Once enabled, device firmware upgrade process will start instantly."
-                    },
-                    {
-                        "type": "text",
-                        "id": "schedule",
-                        "optional": false,
-                        "label": "Enter the date and time to schedule firmware upgrade."
-                    },
-                    {
-                        "type": "text",
-                        "id": "server",
-                        "optional": true,
-                        "label": "Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota)"
-                    }
-                ]
-            },
-            "DEVICE_MUTE": {
-                "icon": "fw-mute"
-            },
-            "NOTIFICATION": {
-                "icon": "fw-message",
-                "formParams": [
-                    {
-                        "type": "text",
-                        "id": "messageText",
-                        "optional": false,
-                        "label": "Title Here..."
-                    },
-                    {
-                        "type": "text",
-                        "id": "messageTitle",
-                        "optional": false,
-                        "label": "Message Here..."
-                    }
-                ]
+                "icon": "fw-refresh",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/reboot"
             },
             "LOCK_RESET": {
-                "icon": "fw-security"
+                "icon": "fw-security",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/lock-reset"
 
             },
             "DISENROLL": {
-                "icon": "fw-block"
+                "icon": "fw-block",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/disenroll"
             },
             "WIPE_DATA": {
-                "icon": "fw-delete"
+                "icon": "fw-delete",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/wipe"
             }
         }
     }