diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java
index 6913d5316..122b3c70f 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java
@@ -272,12 +272,18 @@ public class AndroidFeatureManager implements FeatureManager {
         feature.setDescription("Reboot the device");
         supportedFeatures.add(feature);
         
-	feature = new Feature();
+	    feature = new Feature();
         feature.setCode("UPGRADE_FIRMWARE");
         feature.setName("Upgrade Firmware");
         feature.setDescription("Upgrade Firmware");
         supportedFeatures.add(feature);
 
+        feature = new Feature();
+        feature.setCode("VPN");
+        feature.setName("Configure VPN");
+        feature.setDescription("Configure VPN settings");
+        supportedFeatures.add(feature);
+
         return supportedFeatures;
     }