diff --git a/confluent_server/confluent/discovery/core.py b/confluent_server/confluent/discovery/core.py
index 4934f728..3e4dc840 100644
--- a/confluent_server/confluent/discovery/core.py
+++ b/confluent_server/confluent/discovery/core.py
@@ -704,6 +704,10 @@ def discover_node(cfg, handler, info, nodename, manual):
             newnodeattribs = {}
             if 'uuid' in info:
                 newnodeattribs['id.uuid'] = info['uuid']
+            if 'serialnumber' in info:
+                newnodeattribs['id.serial'] = info['serialnumber']
+            if 'model' in info:
+                newnodeattribs['id.model'] = info['model']
             if handler.https_cert:
                 newnodeattribs['pubkeys.tls_hardwaremanager'] = \
                     util.get_fingerprint(handler.https_cert)