diff --git a/projects/amdsmi/amdsmi_cli/amdsmi_commands.py b/projects/amdsmi/amdsmi_cli/amdsmi_commands.py
index 9a531d722f..1168b5f963 100644
--- a/projects/amdsmi/amdsmi_cli/amdsmi_commands.py
+++ b/projects/amdsmi/amdsmi_cli/amdsmi_commands.py
@@ -161,12 +161,13 @@ class AMDSMICommands():
         except amdsmi_exception.AmdSmiLibraryException as e:
             uuid = e.get_error_info()
 
-        # Store values based on format
-        if self.logger.is_human_readable_format():
-            self.logger.store_output(args.gpu, 'AMDSMI_SPACING_REMOVAL', {'gpu_bdf':bdf, 'gpu_uuid':uuid})
-        else:
+        # CSV format is intentionally aligned with Host
+        if self.logger.is_csv_format():
             self.logger.store_output(args.gpu, 'gpu_bdf', bdf)
             self.logger.store_output(args.gpu, 'gpu_uuid', uuid)
+        else:
+            self.logger.store_output(args.gpu, 'bdf', bdf)
+            self.logger.store_output(args.gpu, 'uuid', uuid)
 
         if multiple_devices:
             self.logger.store_multiple_device_output()