diff --git a/device/mellanox/x86_64-mlnx_msn2010-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn2010-r0/platform_components.json
index 775c6e22cf..2ffab4b017 100644
--- a/device/mellanox/x86_64-mlnx_msn2010-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn2010-r0/platform_components.json
@@ -2,8 +2,11 @@
     "chassis": {
         "x86_64-mlnx_msn2010-r0": {
             "component": {
+                "ONIE": { },
+                "SSD": { },
                 "BIOS": { },
-                "CPLD": { }
+                "CPLD1": { },
+                "CPLD2": { }
             }
         }
     }
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn2100-r0/platform_components.json
index 6a6a74301c..7778adf6fc 100644
--- a/device/mellanox/x86_64-mlnx_msn2100-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/platform_components.json
@@ -2,8 +2,11 @@
     "chassis": {
         "x86_64-mlnx_msn2100-r0": {
             "component": {
+                "ONIE": { },
+                "SSD": { },
                 "BIOS": { },
-                "CPLD": { }
+                "CPLD1": { },
+                "CPLD2": { }
             }
         }
     }
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn2410-r0/platform_components.json
index 77da35ce58..b6a1555c71 100644
--- a/device/mellanox/x86_64-mlnx_msn2410-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/platform_components.json
@@ -2,8 +2,12 @@
     "chassis": {
         "x86_64-mlnx_msn2410-r0": {
             "component": {
+                "ONIE": { },
+                "SSD": { },
                 "BIOS": { },
-                "CPLD": { }
+                "CPLD1": { },
+                "CPLD2": { },
+                "CPLD3": { }
             }
         }
     }
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn2700-r0/platform_components.json
index 2a60694147..00ef07c819 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/platform_components.json
@@ -2,8 +2,12 @@
     "chassis": {
         "x86_64-mlnx_msn2700-r0": {
             "component": {
+                "ONIE": { },
+                "SSD": { },
                 "BIOS": { },
-                "CPLD": { }
+                "CPLD1": { },
+                "CPLD2": { },
+                "CPLD3": { }
             }
         }
     }
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn2740-r0/platform_components.json
index 7964d9cb87..1765103d2f 100644
--- a/device/mellanox/x86_64-mlnx_msn2740-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn2740-r0/platform_components.json
@@ -2,8 +2,11 @@
     "chassis": {
         "x86_64-mlnx_msn2740-r0": {
             "component": {
+                "ONIE": { },
+                "SSD": { },
                 "BIOS": { },
-                "CPLD": { }
+                "CPLD1": { },
+                "CPLD2": { }
             }
         }
     }
diff --git a/device/mellanox/x86_64-mlnx_msn3420-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn3420-r0/platform_components.json
index f3ea5918a0..b243ca061a 100644
--- a/device/mellanox/x86_64-mlnx_msn3420-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn3420-r0/platform_components.json
@@ -2,6 +2,8 @@
     "chassis": {
         "x86_64-mlnx_msn3420-r0": {
             "component": {
+                "ONIE": { },
+                "SSD": { },
                 "BIOS": { },
                 "CPLD1": { },
                 "CPLD2": { },
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn3700-r0/platform_components.json
index 7c0b7598af..c374fb0aba 100644
--- a/device/mellanox/x86_64-mlnx_msn3700-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn3700-r0/platform_components.json
@@ -2,8 +2,12 @@
     "chassis": {
         "x86_64-mlnx_msn3700-r0": {
             "component": {
+                "ONIE": { },
+                "SSD": { },
                 "BIOS": { },
-                "CPLD": { }
+                "CPLD1": { },
+                "CPLD2": { },
+                "CPLD3": { }
             }
         }
     }
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn3700c-r0/platform_components.json
index c55b9feab7..437804c652 100644
--- a/device/mellanox/x86_64-mlnx_msn3700c-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn3700c-r0/platform_components.json
@@ -2,8 +2,12 @@
     "chassis": {
         "x86_64-mlnx_msn3700c-r0": {
             "component": {
+                "ONIE": { },
+                "SSD": { },
                 "BIOS": { },
-                "CPLD": { }
+                "CPLD1": { },
+                "CPLD2": { },
+                "CPLD3": { }
             }
         }
     }
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn3800-r0/platform_components.json
index fa3b172b76..88d3afec16 100644
--- a/device/mellanox/x86_64-mlnx_msn3800-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn3800-r0/platform_components.json
@@ -2,8 +2,13 @@
     "chassis": {
         "x86_64-mlnx_msn3800-r0": {
             "component": {
+                "ONIE": { },
+                "SSD": { },
                 "BIOS": { },
-                "CPLD": { }
+                "CPLD1": { },
+                "CPLD2": { },
+                "CPLD3": { },
+                "CPLD4": { }
             }
         }
     }
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn4600c-r0/platform_components.json
index 300a3827a0..09a7e924d1 100644
--- a/device/mellanox/x86_64-mlnx_msn4600c-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/platform_components.json
@@ -2,6 +2,8 @@
     "chassis": {
         "x86_64-mlnx_msn4600c-r0": {
             "component": {
+                "ONIE": { },
+                "SSD": { },
                 "BIOS": { },
                 "CPLD1": { },
                 "CPLD2": { },
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json
index 2804e29e11..4a64ae0cb2 100644
--- a/device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json
+++ b/device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json
@@ -2,8 +2,12 @@
     "chassis": {
         "x86_64-mlnx_msn4700-r0": {
             "component": {
+                "ONIE": { },
+                "SSD": { },
                 "BIOS": { },
-                "CPLD": { }
+                "CPLD1": { },
+                "CPLD2": { },
+                "CPLD3": { }
             }
         }
     }