diff --git a/sos/report/plugins/mellanox_firmware.py b/sos/report/plugins/mellanox_firmware.py
index e68543b64c..c5c983a4c2 100644
--- a/sos/report/plugins/mellanox_firmware.py
+++ b/sos/report/plugins/mellanox_firmware.py
@@ -103,18 +103,18 @@ def setup(self):
             # mft package commands
             # the commands do not support position independent arguments
             commands = [
-                ["mlxdump -d ", " pcie_uc --all"],
-                ["mstconfig -d ", " -e q"],
+                ["mlxdump -d ", " mstdump --all"],
+                ["mlxconfig -d ", " -e q"],
                 ["flint -d ", " dc"],
                 ["flint -d ", " q"],
                 ["mlxreg -d ", " --reg_name ROCE_ACCL --get"],
                 ["mlxlink -d ", ""],
-                ["fwtrace -d ", " -i all --tracer_mode FIFO"],
+                ["resourcedump dump --device ", " --segment 0x400"],
             ]
         for device in devices:
             for command in commands:
                 self.add_cmd_output(f"{command[0]} {device} "
-                                    f"{command[1]}", timeout=30)
+                                    f"{command[1]}", timeout=300)
 
             # Dump the output of the mstdump command three times
             # waiting for one second. This output is useful to check