diff --git a/projects/amdsmi/amdsmi_cli/amdsmi_commands.py b/projects/amdsmi/amdsmi_cli/amdsmi_commands.py
index 97fbd7fe39..ab64dc6b94 100644
--- a/projects/amdsmi/amdsmi_cli/amdsmi_commands.py
+++ b/projects/amdsmi/amdsmi_cli/amdsmi_commands.py
@@ -6856,7 +6856,7 @@ class AMDSMICommands():
         processors = amdsmi_interface.amdsmi_get_processor_handles()
         version_info = {"amd-smi": "N/A",
                         "amdgpu version": "N/A",
-                        "rocm version": "N/A"}
+                        "rocm version": (False, "N/A")}
         version_info['rocm version'] = amdsmi_interface.amdsmi_get_rocm_version()
         try:
             version_info["amdgpu version"] = amdsmi_interface.amdsmi_get_gpu_driver_info(processors[0])
diff --git a/projects/amdsmi/amdsmi_cli/amdsmi_logger.py b/projects/amdsmi/amdsmi_cli/amdsmi_logger.py
index b3520e9cd9..3e5bc01f2e 100644
--- a/projects/amdsmi/amdsmi_cli/amdsmi_logger.py
+++ b/projects/amdsmi/amdsmi_cli/amdsmi_logger.py
@@ -1006,7 +1006,17 @@ class AMDSMILogger():
         if driver_version == "N/A":
             amdgpu_version = "N/A".ljust(8)
         else:
-            amdgpu_version = str(driver_version['driver_version']).ljust(8)
+            # Example driver version string for amdgpu: 6.8.0-60 : 'Linuxversion6.8.0-60-generic(buildd@lcy02-amd64-098)(x86_64-linux-gnu-gcc-12(Ubuntu12.3.0-1ubuntu1~22.04)12.3.0,GNUld(GNUBinutilsforUbuntu)2.38)#63~22.04.1-UbuntuSMPPREEMPT_DYNAMICTueApr2219:00:15UTC2'
+            # Extract version before "-generic" if it exists
+            if '-generic' in driver_version['driver_version']:
+                # Extract version using regex to find pattern like "6.8.0-60"
+                match = re.search(r'(\d+\.\d+\.\d+-\d+)', driver_version['driver_version'])
+                if match:
+                    amdgpu_version = match.group(1).ljust(8)
+                else:
+                    amdgpu_version = "N/A".ljust(8)
+            else:
+                amdgpu_version = str(driver_version['driver_version'])[:8].ljust(8)
 
         # print GPU info
         print(default_line_1)