diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py b/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
index 962901a61215..9e09a1bf0e44 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/device_data.py
@@ -29,7 +29,9 @@
                 "unk_untrust": {"-127:25":13, "26:30":14 , "31:35":15, "36:120":16}
             },
             "capability": {
-                "comex_amb": False
+                "comex_amb": False,
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -41,7 +43,9 @@
             },
             "capability": {
                 "cpu_pack": False,
-                "comex_amb": False
+                "comex_amb": False,
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -53,7 +57,9 @@
             },
             "capability": {
                 "cpu_pack": False,
-                "comex_amb": False
+                "comex_amb": False,
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -64,7 +70,9 @@
                 "unk_untrust": {"-127:25":13, "26:30":14 , "31:35":15, "36:120":16}
             },
             "capability": {
-                "comex_amb": False
+                "comex_amb": False,
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -76,7 +84,9 @@
             },
             "capability": {
                 "cpu_pack": False,
-                "comex_amb": False
+                "comex_amb": False,
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -85,6 +95,10 @@
             'minimum_table': {
                 "unk_trust":   {"-127:25":12, "26:40":13 , "41:120":14},
                 "unk_untrust": {"-127:15":12, "16:30":13 , "31:35":14, "36:40":15, "41:120":16},
+            },
+            "capability": {
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -93,6 +107,10 @@
             'minimum_table': {
                 "unk_trust":   {"-127:40":12, "41:120":13},
                 "unk_untrust": {"-127:10":12, "11:20":13 , "21:30":14, "31:35":15, "36:120":16},
+            },
+            "capability": {
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -101,6 +119,10 @@
             'minimum_table': {
                 "unk_trust":   {"-127:30":12, "31:40":13 , "41:120":14},
                 "unk_untrust": {"-127:0":12, "1:10":13 , "11:15":14, "16:20":15, "21:35":16, "36:120":17},
+            },
+            "capability": {
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -109,6 +131,10 @@
             'minimum_table': {
                 "unk_trust":   {"-127:35":14, "36:120":15},
                 "unk_untrust": {"-127:35":14, "36:120":15},
+            },
+            "capability": {
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -117,6 +143,10 @@
             'minimum_table': {
                 "unk_trust":   {"-127:40":12, "41:120":13},
                 "unk_untrust": {"-127:10":12, "11:20":13, "21:30":14, "31:35":15, "36:120":16},
+            },
+            "capability": {
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -125,6 +155,10 @@
             'minimum_table': {
                 "unk_trust":   {"-127:120":12},
                 "unk_untrust": {"-127:25":12, "26:35":13, "36:40":14, "41:120":16},
+            },
+            "capability": {
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -133,6 +167,10 @@
             'minimum_table': {
                 "unk_trust":   {"-127:40":12, "41:120":13},
                 "unk_untrust": {"-127:5":12, "6:20":13, "21:30":14, "31:35":15, "36:40":16, "41:120":17},
+            },
+            "capability": {
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
@@ -141,13 +179,19 @@
             'minimum_table': {
                 "unk_trust": {"-127:40": 12, "41:120": 13},
                 "unk_untrust": {"-127:5": 12, "6:20": 13, "21:30": 14, "31:35": 15, "36:40": 16, "41:120": 17},
+            },
+            "capability": {
+                "cpu_amb": False,
+                "swb_amb": False
             }
         }
     },
     'x86_64-mlnx_msn4800-r0': {
         'thermal': {
             "capability": {
-                "comex_amb": False
+                "comex_amb": False,
+                "cpu_amb": False,
+                "swb_amb": False
             }
         },
         'sfp': {
diff --git a/platform/mellanox/mlnx-platform-api/tests/test_thermal.py b/platform/mellanox/mlnx-platform-api/tests/test_thermal.py
index a3e90d7c56cd..0f662872c85c 100644
--- a/platform/mellanox/mlnx-platform-api/tests/test_thermal.py
+++ b/platform/mellanox/mlnx-platform-api/tests/test_thermal.py
@@ -48,7 +48,8 @@ def test_chassis_thermal(self):
             thermal_type = rule.get('type', 'single')
             if thermal_type == 'single':
                 thermal_name = rule['name']
-                if rule['temperature'] == 'comex_amb':
+                excluded_thermals = ['comex_amb', 'cpu_amb', 'swb_amb']
+                if rule['temperature'] in excluded_thermals:
                     assert thermal_name not in thermal_dict
                     continue
                 assert thermal_name in thermal_dict