diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
index d98d05d06edfba38733b8e2bbc5e4b18d4485ee8..92eadadd0caf81d7cae1c2974fb388884ef6d4b9 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-1.json
@@ -37,6 +37,7 @@
     {
       "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.120.1",
@@ -44,13 +45,15 @@
       "kavlan": false,
       "mac": "84:16:0c:4b:9b:36",
       "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
       "mountable": true,
       "mounted": true,
       "name": "ens10f0np0",
       "network_address": "montcalm-1.toulouse.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/1"
+      "switch_port": "tengigabitethernet1/1/1",
+      "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
       "device": "bmc",
@@ -101,7 +104,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "id": "Unknown",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HPE P40498-B21",
       "size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
index c6b4c226f013dfdc408e5d7bb0f40b47eb1ad110..6843ad4b0c761f456469db89647634349e2c0acd 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-2.json
@@ -37,6 +37,7 @@
     {
       "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.120.2",
@@ -44,13 +45,15 @@
       "kavlan": false,
       "mac": "84:16:0c:4a:29:04",
       "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
       "mountable": true,
       "mounted": true,
       "name": "ens10f0np0",
       "network_address": "montcalm-2.toulouse.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/2"
+      "switch_port": "tengigabitethernet1/1/2",
+      "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
       "device": "bmc",
@@ -101,7 +104,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "id": "Unknown",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HPE P40498-B21",
       "size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
index 39237c5fa76bce6af1895d53810db8ab36c9df25..771e390fb16e340e75f53d58921fb0011c3b0cd1 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
@@ -37,6 +37,7 @@
     {
       "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.120.3",
@@ -44,13 +45,15 @@
       "kavlan": false,
       "mac": "84:16:0c:4b:fe:6c",
       "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
       "mountable": true,
       "mounted": true,
       "name": "ens10f0np0",
       "network_address": "montcalm-3.toulouse.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/3"
+      "switch_port": "tengigabitethernet1/1/3",
+      "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
       "device": "bmc",
@@ -101,7 +104,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "id": "Unknown",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HPE P40498-B21",
       "size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
index 1369e34734169a507a402e023ed38934405eb412..900f2fe59840981a9851014d98d382ad73f4937d 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-4.json
@@ -37,6 +37,7 @@
     {
       "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.120.4",
@@ -44,13 +45,15 @@
       "kavlan": false,
       "mac": "84:16:0c:4b:de:14",
       "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
       "mountable": true,
       "mounted": true,
       "name": "ens10f0np0",
       "network_address": "montcalm-4.toulouse.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/4"
+      "switch_port": "tengigabitethernet1/1/4",
+      "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
       "device": "bmc",
@@ -101,7 +104,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "id": "Unknown",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HPE P40498-B21",
       "size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
index d991062a9d8e3cce965977029ba57fe6c61f668e..2feba7799beea53127046ccbbeef18a0bb16788f 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
@@ -37,6 +37,7 @@
     {
       "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.120.5",
@@ -44,13 +45,15 @@
       "kavlan": false,
       "mac": "84:16:0c:4b:1a:ae",
       "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
       "mountable": true,
       "mounted": true,
       "name": "ens10f0np0",
       "network_address": "montcalm-5.toulouse.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/5"
+      "switch_port": "tengigabitethernet1/1/5",
+      "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
       "device": "bmc",
@@ -101,7 +104,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "id": "Unknown",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HPE P40498-B21",
       "size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
index 4a7653bab0909e7387b672e59444db925daf7889..5c75d1ebabbb05c222c4fd7bc57a7ffe69d1fca6 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
@@ -37,6 +37,7 @@
     {
       "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.120.6",
@@ -44,13 +45,15 @@
       "kavlan": false,
       "mac": "84:16:0c:4b:cd:8e",
       "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
       "mountable": true,
       "mounted": true,
       "name": "ens10f0np0",
       "network_address": "montcalm-6.toulouse.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/6"
+      "switch_port": "tengigabitethernet1/1/6",
+      "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
       "device": "bmc",
@@ -101,7 +104,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "id": "Unknown",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HPE P40498-B21",
       "size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
index cf54093e1c6169824e65792209b2e95d6c399e1d..23b683b952e8d7319afda046ae2b40fa2ab8364b 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-7.json
@@ -37,6 +37,7 @@
     {
       "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.120.7",
@@ -44,13 +45,15 @@
       "kavlan": false,
       "mac": "84:16:0c:4b:c1:88",
       "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
       "mountable": true,
       "mounted": true,
       "name": "ens10f0np0",
       "network_address": "montcalm-7.toulouse.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/7"
+      "switch_port": "tengigabitethernet1/1/7",
+      "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
       "device": "bmc",
@@ -101,7 +104,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "id": "Unknown",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HPE P40498-B21",
       "size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
index e9ce7bb4e39539c310095223f3e918dcea8165f6..7eddc50fdc5dca32edab0cf67570c558903e899e 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
@@ -37,6 +37,7 @@
     {
       "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.120.8",
@@ -44,13 +45,15 @@
       "kavlan": false,
       "mac": "84:16:0c:4b:cd:46",
       "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
       "mountable": true,
       "mounted": true,
       "name": "ens10f0np0",
       "network_address": "montcalm-8.toulouse.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/8"
+      "switch_port": "tengigabitethernet1/1/8",
+      "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
       "device": "bmc",
@@ -101,7 +104,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "id": "Unknown",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HPE P40498-B21",
       "size": 1030792151040,
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
index d7c4d0658ed90350e4897ddb6f13a71254808b06..5951a2e4221f8b42cf4871230e624c018f098c7f 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-9.json
@@ -37,6 +37,7 @@
     {
       "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.120.9",
@@ -44,13 +45,15 @@
       "kavlan": false,
       "mac": "84:16:0c:4b:2e:28",
       "management": false,
+      "model": "BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller",
       "mountable": true,
       "mounted": true,
       "name": "ens10f0np0",
       "network_address": "montcalm-9.toulouse.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw-toulouse",
-      "switch_port": "tengigabitethernet1/1/9"
+      "switch_port": "tengigabitethernet1/1/9",
+      "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
       "device": "bmc",
@@ -101,7 +104,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "id": "Unknown",
+      "id": "disk0",
       "interface": "SATA",
       "model": "HPE P40498-B21",
       "size": 1030792151040,
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
index a0795dc34bb2e9298809207886a0525409414fbf..67aa8ba5206b7cc3043ca3eb3eeb80573dbfb864 100644
--- a/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/montcalm.yaml
@@ -43,6 +43,9 @@ nodes:
         rate: 10000000000
         management: false
         name: ens10f0np0
+        vendor: Broadcom Inc. and subsidiaries
+        model: BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
+        driver: bnxt_en
         enabled: true
         mountable: true
         mounted: true
@@ -69,9 +72,9 @@ nodes:
       vendor: Intel
       version: Silver 4314
     storage_devices:
-      disk0:
+      pci-0000:00:17.0-ata-1:
         size: 1030792151040
-        id: Unknown
+        id: disk0
         model: HPE P40498-B21
         interface: SATA
         storage: SSD