diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
index e55eb12fed..89fd71d03c 100644
--- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
+++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
@@ -135,10 +135,13 @@ class LocalClusterOutputDeviceManager:
         ultimaker_machines = container_registry.findContainersMetadata(type="machine", manufacturer="Ultimaker B.V.")
         found_machine_type_identifiers = {}  # type: Dict[str, str]
         for machine in ultimaker_machines:
-            machine_bom_number = machine.get("firmware_update_info", {}).get("id", None)
             machine_type = machine.get("id", None)
-            if machine_bom_number and machine_type:
-                found_machine_type_identifiers[str(machine_bom_number)] = machine_type
+            machine_bom_numbers = machine.get("bom_numbers", [])
+            if machine_type and machine_bom_numbers:
+                for bom_number in machine_bom_numbers:
+                    # This produces a n:1 mapping of bom numbers to machine types
+                    # allowing the S5R1 and S5R2 hardware to use a single S5 definition.
+                    found_machine_type_identifiers[str(bom_number)] = machine_type
         return found_machine_type_identifiers
 
     ## Add a new device.
diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index bd7e96448a..b34ff3bdba 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -33,7 +33,10 @@
                 "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version"
             ],
             "update_url": "https://ultimaker.com/firmware"
-        }
+        },
+        "bom_numbers": [
+            9066
+        ]
     },
 
 
diff --git a/resources/definitions/ultimaker3_extended.def.json b/resources/definitions/ultimaker3_extended.def.json
index c0d099366d..ba9824896f 100644
--- a/resources/definitions/ultimaker3_extended.def.json
+++ b/resources/definitions/ultimaker3_extended.def.json
@@ -30,7 +30,10 @@
                 "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version"
             ],
             "update_url": "https://ultimaker.com/firmware"
-        }
+        },
+        "bom_numbers": [
+            9511
+        ]
     },
 
     "overrides": {
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 0fbf4acd77..f7f3a038fe 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -34,7 +34,10 @@
             "id": 213482,
             "check_urls": ["https://software.ultimaker.com/releases/firmware/213482/stable/um-update.swu.version"],
             "update_url": "https://ultimaker.com/firmware"
-        }
+        },
+        "bom_numbers": [
+            213482
+        ]
     },
 
     "overrides": {
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 81b3a704ff..fef8c87c27 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -35,7 +35,10 @@
             "id": 9051,
             "check_urls": ["https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version"],
             "update_url": "https://ultimaker.com/firmware"
-        }
+        },
+        "bom_numbers": [
+            9051, 214475
+        ]
     },
 
     "overrides": {