diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
index 495fcd187c..e3b728eecd 100644
--- a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
+++ b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
@@ -36,6 +36,7 @@ public class AndroidDeviceManagementService implements DeviceManagementService {
 
     private DeviceManager deviceManager;
     public static final String DEVICE_TYPE_ANDROID = "android";
+    public static final String DEVICE_TYPE_TENANT = "carbon.super";
 
     @Override
     public String getType() {
@@ -44,12 +45,12 @@ public class AndroidDeviceManagementService implements DeviceManagementService {
 
     @Override
     public String getProviderTenantDomain() {
-        return null;
+        return DEVICE_TYPE_TENANT;
     }
 
     @Override
     public boolean isSharedWithAllTenants() {
-        return false;
+        return true;
     }
 
     @Override
diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java
index 9795db0f71..4ecfa14c47 100644
--- a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java
+++ b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java
@@ -36,6 +36,7 @@ public class WindowsDeviceManagementService implements DeviceManagementService {
 
     private DeviceManager deviceManager;
     public static final String DEVICE_TYPE_WINDOWS = "windows";
+    public static final String DEVICE_TYPE_TENANT = "carbon.super";
 
     @Override
     public String getType() {
@@ -44,12 +45,12 @@ public class WindowsDeviceManagementService implements DeviceManagementService {
 
     @Override
     public String getProviderTenantDomain() {
-        return null;
+        return DEVICE_TYPE_TENANT;
     }
 
     @Override
     public boolean isSharedWithAllTenants() {
-        return false;
+        return true;
     }
 
     @Override