diff --git a/engine/cli/commands/hardware_list_cmd.cc b/engine/cli/commands/hardware_list_cmd.cc
index 0b65bba39..a800b0e24 100644
--- a/engine/cli/commands/hardware_list_cmd.cc
+++ b/engine/cli/commands/hardware_list_cmd.cc
@@ -50,7 +50,7 @@ bool HardwareListCmd::Exec(const std::string& host, int port,
   if (!ho.has_value() || ho.value().show_cpu) {
     std::cout << "CPU Information:" << std::endl;
     Table table;
-    std::vector<std::string> column_headers{"(Index)", "Arch", "Cores", "Model",
+    std::vector<std::string> column_headers{"#", "Arch", "Cores", "Model",
                                             "Instructions"};
 
     Row_t header{column_headers.begin(), column_headers.end()};
@@ -74,7 +74,7 @@ bool HardwareListCmd::Exec(const std::string& host, int port,
   if (!ho.has_value() || ho.value().show_os) {
     std::cout << "OS Information:" << std::endl;
     Table table;
-    std::vector<std::string> column_headers{"(Index)", "Version", "Name"};
+    std::vector<std::string> column_headers{"#", "Version", "Name"};
 
     Row_t header{column_headers.begin(), column_headers.end()};
     table.add_row(header);
@@ -91,7 +91,7 @@ bool HardwareListCmd::Exec(const std::string& host, int port,
   if (!ho.has_value() || ho.value().show_ram) {
     std::cout << "RAM Information:" << std::endl;
     Table table;
-    std::vector<std::string> column_headers{"(Index)", "Total (MiB)",
+    std::vector<std::string> column_headers{"#", "Total (MiB)",
                                             "Available (MiB)"};
 
     Row_t header{column_headers.begin(), column_headers.end()};
@@ -106,14 +106,18 @@ bool HardwareListCmd::Exec(const std::string& host, int port,
     std::cout << std::endl;
   }
 
- if (!ho.has_value() || ho.value().show_gpu) {
+  if (!ho.has_value() || ho.value().show_gpu) {
     std::cout << "GPU Information:" << std::endl;
     Table table;
-    std::vector<std::string> column_headers{
-        "(Index)",        "ID",
-        "Name",           "Version",
-        "Total (MiB)",    "Available (MiB)",
-        "Driver Version", "Compute Capability", "Activated"};
+    std::vector<std::string> column_headers{"#",
+                                            "GPU ID",
+                                            "Name",
+                                            "Version",
+                                            "Total (MiB)",
+                                            "Available (MiB)",
+                                            "Driver Version",
+                                            "Compute Capability",
+                                            "Activated"};
 
     Row_t header{column_headers.begin(), column_headers.end()};
     table.add_row(header);
@@ -144,7 +148,7 @@ bool HardwareListCmd::Exec(const std::string& host, int port,
   if (!ho.has_value() || ho.value().show_storage) {
     std::cout << "Storage Information:" << std::endl;
     Table table;
-    std::vector<std::string> column_headers{"(Index)", "Total (GiB)",
+    std::vector<std::string> column_headers{"#", "Total (GiB)",
                                             "Available (GiB)"};
 
     Row_t header{column_headers.begin(), column_headers.end()};
@@ -163,14 +167,15 @@ bool HardwareListCmd::Exec(const std::string& host, int port,
   if (!ho.has_value() || ho.value().show_power) {
     std::cout << "Power Information:" << std::endl;
     Table table;
-    std::vector<std::string> column_headers{"(Index)", "Battery Life",
+    std::vector<std::string> column_headers{"#", "Battery Life",
                                             "Charging Status", "Power Saving"};
 
     Row_t header{column_headers.begin(), column_headers.end()};
     table.add_row(header);
     table.format().font_color(Color::green);
     std::vector<std::string> row = {"1"};
-    cortex::hw::PowerInfo pi = cortex::hw::power::FromJson(result.value()["power"]);
+    cortex::hw::PowerInfo pi =
+        cortex::hw::power::FromJson(result.value()["power"]);
     row.emplace_back(std::to_string(pi.battery_life));
     row.emplace_back(pi.charging_status);
     row.emplace_back(pi.is_power_saving ? "Yes" : "No");
diff --git a/engine/services/hardware_service.cc b/engine/services/hardware_service.cc
index c40133564..b9f8fe63b 100644
--- a/engine/services/hardware_service.cc
+++ b/engine/services/hardware_service.cc
@@ -297,6 +297,8 @@ void HardwareService::UpdateHardwareInfos() {
 
 bool HardwareService::IsValidConfig(
     const cortex::hw::ActivateHardwareConfig& ahc) {
+  if (ahc.gpus.empty())
+    return true;
   cortex::db::Hardwares hw_db;
   auto is_valid = [&ahc](int software_id) {
     return std::count(ahc.gpus.begin(), ahc.gpus.end(), software_id) > 0;