diff --git a/util/dbus.cpp b/util/dbus.cpp
index c1b8741..38c77e3 100644
--- a/util/dbus.cpp
+++ b/util/dbus.cpp
@@ -439,6 +439,11 @@
                     {"0x50001003", MachineType::Rainier_1S2U},
                     {"0x50003000", MachineType::Everest},
                     {"0x50004000", MachineType::Bonnell},
+                    {"0x60001000", MachineType::BlueRidge_2S4U},
+                    {"0x60001001", MachineType::BlueRidge_2S2U},
+                    {"0x60001002", MachineType::BlueRidge_1S4U},
+                    {"0x60002000", MachineType::Fuji},
+                    {"0x60004000", MachineType::Balcones},
                 };
 
                 machineType = typeMap.at(hexId);
diff --git a/util/dbus.hpp b/util/dbus.hpp
index 0a8ede5..e2a2b39 100644
--- a/util/dbus.hpp
+++ b/util/dbus.hpp
@@ -168,6 +168,11 @@
     Rainier_1S2U,
     Everest,
     Bonnell,
+    BlueRidge_2S4U,
+    BlueRidge_2S2U,
+    BlueRidge_1S4U,
+    Fuji,
+    Balcones,
 };
 
 /**
diff --git a/util/pdbg.cpp b/util/pdbg.cpp
index 50b4e7d..20a7cff 100644
--- a/util/pdbg.cpp
+++ b/util/pdbg.cpp
@@ -244,25 +244,30 @@
     util::dbus::MachineType machineType = util::dbus::getMachineType();
     switch (machineType)
     {
-        // Rainier 4U
+        // Rainier/Blue Ridge 4U
         case util::dbus::MachineType::Rainier_2S4U:
         case util::dbus::MachineType::Rainier_1S4U:
+        case util::dbus::MachineType::BlueRidge_2S4U:
+        case util::dbus::MachineType::BlueRidge_1S4U:
             filePath =
                 fs::path{PACKAGE_DIR "util-data/peer-targets-rainier-4u.json"};
             break;
-        // Rainier 2U
+        // Rainier/Blue Ridge 2U
         case util::dbus::MachineType::Rainier_2S2U:
         case util::dbus::MachineType::Rainier_1S2U:
+        case util::dbus::MachineType::BlueRidge_2S2U:
             filePath =
                 fs::path{PACKAGE_DIR "util-data/peer-targets-rainier-2u.json"};
             break;
-        // Everest
+        // Everest/Fuji
         case util::dbus::MachineType::Everest:
+        case util::dbus::MachineType::Fuji:
             filePath =
                 fs::path{PACKAGE_DIR "util-data/peer-targets-everest.json"};
             break;
-        // Bonnell
+        // Bonnell/Balcones
         case util::dbus::MachineType::Bonnell:
+        case util::dbus::MachineType::Balcones:
             filePath =
                 fs::path{PACKAGE_DIR "util-data/peer-targets-bonnell.json"};
             break;