diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
index f60b9cca6a..a5dad642b7 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
@@ -41,16 +41,6 @@
         <HideDomainSelectionInSubTenant>true</HideDomainSelectionInSubTenant>
     </Billing>
     <DeviceInfoConfigurations>
-        <DeviceInfoItem>
-            <DefinedValue>FIRMWARE_VERSION</DefinedValue>
-            <DisplayValue>label_firmware_version</DisplayValue>
-            <Type>deviceInfo</Type>
-        </DeviceInfoItem>
-        <DeviceInfoItem>
-            <DefinedValue>FIRMWARE_APP_VERSION</DefinedValue>
-            <DisplayValue>label_app_version</DisplayValue>
-            <Type>deviceInfo</Type>
-        </DeviceInfoItem>
         <DeviceInfoItem>
             <DefinedValue>name</DefinedValue>
             <DisplayValue>label_device</DisplayValue>
@@ -91,6 +81,21 @@
             <DisplayValue>label_actions</DisplayValue>
             <Type>default</Type>
         </DeviceInfoItem>
+        <DeviceInfoItem>
+            <DefinedValue>FIRMWARE_VERSION</DefinedValue>
+            <DisplayValue>label_firmware_version</DisplayValue>
+            <Type>deviceDetailsMap</Type>
+        </DeviceInfoItem>
+        <DeviceInfoItem>
+            <DefinedValue>FIRMWARE_APP_VERSION</DefinedValue>
+            <DisplayValue>label_app_version</DisplayValue>
+            <Type>deviceDetailsMap</Type>
+        </DeviceInfoItem>
+        <DeviceInfoItem>
+            <DefinedValue>FIRMWARE_SYSTEM_VERSION</DefinedValue>
+            <DisplayValue>label_firmware_system_version</DisplayValue>
+            <Type>deviceDetailsMap</Type>
+        </DeviceInfoItem>
         <DeviceInfoItem>
             <DefinedValue>batteryLevel</DefinedValue>
             <DisplayValue>label_battery_leve</DisplayValue>