diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/mercantour3.json b/data/grid5000/sites/sophia/clusters/mercantour3/mercantour3.json
index 58e9a531244bbc24477eb8f69025531444ca7880..14c1e395e2bd390400c4d2e70b88956f67cf9fa9 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/mercantour3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/mercantour3.json
@@ -3,7 +3,7 @@
   "created_at": "Mon, 19 May 2025 00:00:00 GMT",
   "exotic": false,
   "kavlan": false,
-  "manufactured_at": "1970-01-01",
+  "manufactured_at": "2017-11-13",
   "metrics": [
     {
       "description": "Default subset of metrics from Prometheus Node Exporter",
@@ -49,12 +49,100 @@
         "port": 9100,
         "protocol": "prometheus"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_packets_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_packets_discard_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_discard_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_packets_error_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_error_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge C6420",
   "nodes_count": 16,
-  "nodes_description": "1 CPU Intel Xeon Silver 4114, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 1Gb Ethernet",
-  "priority": 197001,
+  "nodes_description": "2 CPUs Intel Xeon Silver 4114, 10 cores/CPU, 192GB RAM, 558GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
+  "priority": 201711,
   "queues": [
     "admin",
     "testing"
@@ -62,5 +150,5 @@
   "redfish": true,
   "type": "cluster",
   "uid": "mercantour3",
-  "warranty_end": "1970-01-01"
+  "warranty_end": "2024-11-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-1.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-1.json
index d5c15d8912ff300900ec7c17085e33de3908c865..2bf24bdcbd7e08ae89e92e77228c7a9f244160df 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-1.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "08/28/2020",
+    "vendor": "Dell Inc.",
+    "version": "2.8.2"
   },
-  "bmc_version": "v1",
+  "bmc_version": "4.20.20.20",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "D8WPCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x80000ec9, 18.0.17",
       "interface": "Ethernet",
       "ip": "172.16.130.25",
       "ip6": "2001:660:4406:800:3::19",
       "kavlan": false,
       "mac": "50:9a:4c:6c:38:af",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-1.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 25 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2f41",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.25",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2f:41",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-1-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3c2504",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-1"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-10.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-10.json
index 64d38603e60a1a170d3a2c8dd9f37b3b0b05f7bd..c40d78f95145ac29281c66b4e9d980c48435b88c 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-10.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-10.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-14",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F34SCM2",
+    "warranty_end": "2024-11-14"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.34",
       "ip6": "2001:660:4406:800:3::22",
       "kavlan": false,
       "mac": "50:9a:4c:70:fa:3c",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-10.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 30 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2d81",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.34",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2d:81",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-10-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3b5f18",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-10"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-11.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-11.json
index f3d7ca2c3256c41dbe7c80f6c2202c7e9094e0c0..28ed20ca0dc0b687738dd65c7598102c3cd49b96 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-11.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-11.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-14",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F33WCM2",
+    "warranty_end": "2024-11-14"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.35",
       "ip6": "2001:660:4406:800:3::23",
       "kavlan": false,
       "mac": "50:9a:4c:70:fa:7c",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-11.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 5 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2e81",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.35",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2e:81",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-11-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3cab98",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-11"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-12.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-12.json
index e07cdaab69da30777470f8a8cfc0d57c92f4b736..2667bf9293b6cffd2c44cf992c5aaa5415d93ca1 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-12.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-12.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-14",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F35NCM2",
+    "warranty_end": "2024-11-14"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.36",
       "ip6": "2001:660:4406:800:3::24",
       "kavlan": false,
       "mac": "50:9a:4c:70:aa:e1",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-12.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 6 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2d91",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.36",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2d:91",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-12-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3bc228",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-12"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-13.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-13.json
index 494d2eb32831d229d0396849b34b8adfc82ac552..72717db3b79117bf2dc2ecaffa70bf5ba5a752ce 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-13.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-13.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F2XQCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.37",
       "ip6": "2001:660:4406:800:3::25",
       "kavlan": false,
       "mac": "50:9a:4c:6c:38:ad",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-13.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 31 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2d71",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.37",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2d:71",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-13-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3c1504",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-13"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-14.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-14.json
index 7dcf8ccb2da7e2e1d71cdecdeac2fa54a69a66fd..420f447cf7146eeaddd348815160f522903ef2b2 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-14.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-14.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F2YPCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.38",
       "ip6": "2001:660:4406:800:3::26",
       "kavlan": false,
       "mac": "50:9a:4c:6c:38:6b",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-14.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 32 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2ec1",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.38",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2e:c1",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-14-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3be804",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-14"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-15.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-15.json
index d77366bd2451819eeb5b494c3cc641bdb240ad18..a99918885e5989550a3e7fdb4e6d1b1aa6fcc33b 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-15.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-15.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F2ZMCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.39",
       "ip6": "2001:660:4406:800:3::27",
       "kavlan": false,
       "mac": "50:9a:4c:6c:39:85",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-15.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 7 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2da1",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.39",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2d:a1",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-15-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3c523c",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-15"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-16.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-16.json
index e62d9cdac882b6503b413aef9b478fdeb96813d5..32065c7b4ad14bdd68f899287620872186db8904 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-16.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-16.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F2ZSCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.40",
       "ip6": "2001:660:4406:800:3::28",
       "kavlan": false,
       "mac": "50:9a:4c:6c:39:89",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-16.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 8 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2f51",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.40",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2f:51",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-16-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3c4fa0",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-16"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-2.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-2.json
index 58ec39c9c4882babb60e2917bc8689f59c4217a2..0fad1290fb020a58672668c33d704cdda86fe120 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-2.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "D8WRCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.26",
       "ip6": "2001:660:4406:800:3::1a",
       "kavlan": false,
       "mac": "50:9a:4c:6c:39:82",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-2.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 26 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2ff1",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.26",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2f:f1",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-2-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3c2124",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-2"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-3.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-3.json
index bcc54db5fc3589c26404fedaa4eaa5b5d72a40e3..5f32d13cf196edfc608baa775a11fc7368a22738 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-3.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "D8WTCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.27",
       "ip6": "2001:660:4406:800:3::1b",
       "kavlan": false,
       "mac": "50:9a:4c:6c:38:d9",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-3.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 1 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2e91",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.27",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2e:91",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-3-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3c8254",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-3"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-4.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-4.json
index e988f386a6872a93f8faf8ffad28582eb4ae67bd..6fcbe689342bc45c979aba8905e052889ac97526 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-4.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "D8WWCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.28",
       "ip6": "2001:660:4406:800:3::1c",
       "kavlan": false,
       "mac": "50:9a:4c:6c:39:53",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-4.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 2 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2fd1",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.28",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2f:d1",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-4-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3be934",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-4"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-5.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-5.json
index 71e14e1c9545e3916fccef23e5e2a300ecbf18f9..2c5a9248ceb953e0de28f4b5bf835d0284652a42 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-5.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-5.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F30TCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.29",
       "ip6": "2001:660:4406:800:3::1d",
       "kavlan": false,
       "mac": "50:9a:4c:6c:38:9e",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-5.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 27 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d3001",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.29",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:30:01",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-5-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3c8228",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-5"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-6.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-6.json
index 3d5eb4f80c49a1411b4fd21df992ba2fdd1f0cff..d19570a626641e0d53db9e2f9360cd53473c01a0 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-6.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-6.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F31QCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.30",
       "ip6": "2001:660:4406:800:3::1e",
       "kavlan": false,
       "mac": "50:9a:4c:6c:39:31",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-6.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 28 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d2fe1",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.30",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:2f:e1",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-6-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3c52ac",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-6"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-7.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-7.json
index beb2a4afc33aa3ca6a183664df411181330b803f..bf3f3ed46f5bd2c83b75d125ee5673e69a118ff6 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-7.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-7.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F31RCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.31",
       "ip6": "2001:660:4406:800:3::1f",
       "kavlan": false,
       "mac": "50:9a:4c:6b:5d:b0",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-7.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 3 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d3011",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.31",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:30:11",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-7-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3c8278",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-7"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-8.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-8.json
index 825efff79649df7552923f79d8414371ac4749d6..3db487662c248f0b42d5e0ab0716ffdbb2b78382 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-8.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-8.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-13",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F31SCM2",
+    "warranty_end": "2024-11-13"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.32",
       "ip6": "2001:660:4406:800:3::20",
       "kavlan": false,
       "mac": "50:9a:4c:85:c8:15",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-8.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 4 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a0300f66fd1",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.32",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:f6:6f:d1",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-8-ib0.sophia.grid5000.fr",
+      "rate": 56000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3c2584",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-8"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-9.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-9.json
index 05dd35556bc9ef87181c2383391da5474807892f..4d53ed24449908e30f6010be69b415175a354520 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-9.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-9.json
@@ -1,26 +1,27 @@
 {
   "architecture": {
-    "cpu_core_numbering": "contiguous",
-    "nb_cores": 72,
-    "nb_procs": 1,
-    "nb_threads": 72,
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 20,
+    "nb_procs": 2,
+    "nb_threads": 40,
     "platform_type": "x86_64"
   },
   "bios": {
-    "release_date": "01/01/2000",
-    "vendor": "Unknown",
-    "version": 1
+    "release_date": "09/19/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
   },
-  "bmc_version": "v1",
+  "bmc_version": "7.00.00.171",
   "chassis": {
-    "manufactured_at": "1970-01-01",
-    "manufacturer": "Unknown",
-    "name": "Unknown",
-    "warranty_end": "1970-01-01"
+    "manufactured_at": "2017-11-14",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge C6420",
+    "serial": "F33RCM2",
+    "warranty_end": "2024-11-14"
   },
   "exotic": false,
   "main_memory": {
-    "ram_size": 8
+    "ram_size": 206158430208
   },
   "management_tools": {
     "bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
   },
   "memory_devices": [
     {
-      "device": "dimm_proc 1 dimm 1",
-      "size": 8,
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
       "technology": "dram"
     }
   ],
   "network_adapters": [
     {
       "device": "eth0",
-      "driver": "mlx_core",
+      "driver": "igb",
       "enabled": true,
+      "firmware_version": "1.67, 0x800010e5, 22.5.7",
       "interface": "Ethernet",
       "ip": "172.16.130.33",
       "ip6": "2001:660:4406:800:3::21",
       "kavlan": false,
       "mac": "50:9a:4c:70:fa:7a",
       "management": false,
+      "model": "I350 Gigabit Network Connection",
       "mountable": true,
       "mounted": true,
       "name": "enp1s0f0np0",
       "network_address": "mercantour3-9.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": null,
-      "switch_port": null
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-4",
+      "switch_port": "Unit: 1 Slot: 0 Port: 29 Gigabit - Level",
+      "vendor": "Intel"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.40.5048",
+      "guid": "0xec0d9a03001d3811",
+      "interface": "InfiniBand",
+      "ip": "172.18.130.33",
+      "kavlan": false,
+      "mac": "ec:0d:9a:03:00:1d:38:11",
+      "management": false,
+      "model": "MT27500 Family [ConnectX-3]",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "mercantour3-9-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -69,28 +150,28 @@
   ],
   "nodeset": "mercantour3",
   "operating_system": {
-    "cstate_driver": "unknown",
-    "cstate_governor": "unknown",
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
     "ht_enabled": true,
-    "pstate_driver": "unknwon",
-    "pstate_governor": "unknown",
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
     "turboboost_enabled": true
   },
   "performance": {
     "core_flops": 35200000000,
-    "node_flops": 2534400000000
+    "node_flops": 704000000000
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": 8,
-    "cache_l1i": 8,
-    "cache_l2": 8,
-    "cache_l3": 8,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 14417920,
     "clock_speed": 2200000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
     "microarchitecture": "Skylake-SP",
-    "microcode": "0xd000001",
+    "microcode": "0x2007006",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz",
     "vendor": "Intel",
@@ -99,19 +180,20 @@
   "redfish": true,
   "software": {
     "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2025032008",
+    "postinstall-version": "1.2025042314",
     "standard-environment": "debian11-x64-std"
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x5000cca02f3c2a94",
       "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0",
+      "firmware_version": "FU45",
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
-      "size": 8,
-      "storage": "SSD",
-      "vendor": "Unknown"
+      "model": "HUC101860CSS200",
+      "size": 600127266816,
+      "storage": "HDD",
+      "vendor": "Dell"
     }
   ],
   "supported_job_types": {
@@ -121,7 +203,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "mercantour3-9"
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index 2cd2faab53c2a57caaea739ef858b1ad7b98c20c..9665ce89403f70f5198665c6a6b1d8f7a7f2e704 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2470,6 +2470,72 @@ sites:
             chassis:
               manufactured_at: 2015-09-02
               warranty_end: 2020-09-02
+      mercantour3:
+        nodes:
+          mercantour3-1:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-10:
+            chassis:
+              manufactured_at: 2017-11-14
+              warranty_end: 2024-11-14
+          mercantour3-11:
+            chassis:
+              manufactured_at: 2017-11-14
+              warranty_end: 2024-11-14
+          mercantour3-12:
+            chassis:
+              manufactured_at: 2017-11-14
+              warranty_end: 2024-11-14
+          mercantour3-13:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-14:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-15:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-16:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-2:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-3:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-4:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-5:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-6:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-7:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-8:
+            chassis:
+              manufactured_at: 2017-11-13
+              warranty_end: 2024-11-13
+          mercantour3-9:
+            chassis:
+              manufactured_at: 2017-11-14
+              warranty_end: 2024-11-14
       mercantour4:
         nodes:
           mercantour4-1:
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 89e187a9339f6d8a3f87fa04c21133608f2196e3..bb83acb8113686fdf6cb3ecbb46035f33eb25333 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -88,6 +88,8 @@ disk_vendor_model_mapping:
       - MO006400KXPTU
     ASUS:
       - AsustekPIKE3108
+    Dell:
+      - HUC101860CSS200
   SATA:
     Intel:
       - SSDSCKKB240G8R
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index efc3923de1640e5c2d40e2b5090cf23e02207a00..94792b8c1af644b7462f517b9d3802e4d1e11b39 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -153,6 +153,7 @@ ipv4:
       sophia mercantour2 eth0 0 0 2 16
       sophia mercantour2 ib0  0 0 2 16
       sophia mercantour3 eth0 0 0 2 24
+      sophia mercantour3 ib0  0 0 2 24
       sophia mercantour4 eth0 0 0 2 40
       sophia mercantour4 ib0 0 0 2 40
       sophia mercantour5 eth0 0 0 2 41
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/mercantour3.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/mercantour3.yaml
index b9d22b3c0345e21c6109c5023a275e578b809aa9..2d2f87d78c51f372f6e1ce2e526d3fb1157b06ed 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour3/mercantour3.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/mercantour3.yaml
@@ -9,9 +9,6 @@ queues:
   - testing
 nodes:
   mercantour3-[1-16]:
-    chassis:
-      manufactured_at: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
-      warranty_end: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
     supported_job_types:
       deploy: true
       besteffort: true
@@ -30,10 +27,9 @@ nodes:
         mountable: true
         mounted: true
     storage_devices:
-      disk0: # This field will have to be renamed later.
+      pci-0000:3b:00.0-sas-phy4-lun-0:
         id: disk0
         interface: SAS
-        by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
     software:
       standard-environment: debian11-x64-std
     management_tools:
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/mercantour3_ib.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/mercantour3_ib.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4be78018e80da4b26d3e4143c96d7e5eebef6a2a
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/mercantour3_ib.yaml
@@ -0,0 +1,9 @@
+---
+nodes:
+  mercantour3-[1-16]:
+    network_adapters:
+      ib0:
+        enabled: true
+        mountable: true
+        mounted: true
+        netmask: 255.255.240.0
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/mercantour3/nodes.yaml.erb
deleted file mode 100644
index 277249a080afc4e650749e7ecfe1baab5be0b8a8..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/clusters/mercantour3/nodes.yaml.erb
+++ /dev/null
@@ -1,110 +0,0 @@
-<%
-  # File generated by 'rake mass:create SRC=doc/sophia-clusters-mass-create-tmp.csv
-  # If changes are needed, it might be better to edit the source data and regenerate using 'rake mass:create'
- 
-  cluster_name = "mercantour3"
-  nodes_number = 16 # Size of the cluster (number of nodes)
-  # MAC addresses declaration
-  mac_eth0_list = %w(
-50:9a:4c:6c:38:af
-50:9a:4c:6c:39:82
-50:9a:4c:6c:38:d9
-50:9a:4c:6c:39:53
-50:9a:4c:6c:38:9e
-50:9a:4c:6c:39:31
-50:9a:4c:6b:5d:b0
-50:9a:4c:85:c8:15
-50:9a:4c:70:fa:7a
-50:9a:4c:70:fa:3c
-50:9a:4c:70:fa:7c
-50:9a:4c:70:aa:e1
-50:9a:4c:6c:38:ad
-50:9a:4c:6c:38:6b
-50:9a:4c:6c:39:85
-50:9a:4c:6c:39:89
-  )
-  mac_bmc_list = %w(
-50:9a:4c:6c:32:83
-50:9a:4c:6c:37:75
-50:9a:4c:6c:33:7f
-50:9a:4c:6c:36:5b
-50:9a:4c:6c:32:1d
-50:9a:4c:6c:35:8f
-50:9a:4c:6b:54:b9
-50:9a:4c:85:c5:28
-50:9a:4c:70:f6:58
-50:9a:4c:70:f7:cc
-50:9a:4c:70:f6:4c
-50:9a:4c:70:a4:06
-50:9a:4c:6c:32:77
-50:9a:4c:6c:30:eb
-50:9a:4c:6c:37:87
-50:9a:4c:6c:37:9f
-  )
-%>
----
-nodes:
-<% (1..nodes_number).each { |i| %>
- <%= cluster_name %>-<%= i %>:
-    architecture:
-      nb_procs: 1 # Fake data, will be replaced by g5k-checks
-      nb_cores: 72 # Fake data, will be replaced by g5k-checks
-      nb_threads: 72 # Fake data, will be replaced by g5k-checks
-      platform_type: x86_64 # Fake data, will be replaced by g5k-checks
-      cpu_core_numbering: contiguous # Fake data, will be replaced by g5k-checks
-    bios:
-      release_date: 01/01/2000 # Fake date, will be replaced by g5k-checks
-      vendor: Unknown # Fake vendor, will be replaced by g5k-checks
-      version: 1 # Fake version, will be replaced by g5k-checks
-    bmc_version: v1 # Fake version, will be replaced by g5k-checks
-    chassis:
-      manufacturer: Unknown # Fake manufacturer, will be replaced by g5k-checks
-      name: Unknown # Fake name, will be replaced by g5k-checks
-    main_memory:
-      ram_size: 8 # Fake size, will be replaced by g5k-checks
-    memory_devices:
-      dimm:
-        size: 8 # Fake size, will be replaced by g5k-checks
-        technology: dram # Common memory technology, will be replaced by g5k-checks
-    processor:
-      model: Intel Xeon # Fake model name, will be replaced by g5k-checks
-      other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz # Fake description, will be replaced by g5k-checks
-      vendor: Intel # Fake vendor, will be replaced by g5k-checks
-      version: Silver 4114 # Fake version, will be replaced by g5k-checks
-      cache_l1d: 8 # Fake cache, will be replaced by g5k-checks
-      cache_l1i: 8 # Fake cache, will be replaced by g5k-checks
-      cache_l2: 8 # Fake cache, will be replaced by g5k-checks
-      cache_l3: 8 # Fake cache, will be replaced by g5k-checks
-      instruction_set: x86-64 # Common instruction set, will be replaced by g5k-checks
-      microcode: "0xd000001" # Fake microcode, will be replaced by g5k-checks
-      ht_capable: true # Default ht capable value, will be replaced by g5k-checks 
-    main_memory:
-      ram_size: 8 # Fake ram size, will be replaced by g5k-checks
-    memory_devices:
-      dimm_proc 1 dimm 1: # Fake dimm name, will be replaced by g5k-checks
-        size: 8 # Fake dimm size, will be replaced by g5k-checks
-        technology: dram # Default dimm technology, will be replaced by g5k-checks
-    operating_system:
-      cstate_driver: unknown # Fake driver, will be replaced by g5k-checks
-      cstate_governor: unknown # Fake governor, will be replaced by g5k-checks
-      ht_enabled: true # common value for hyper threading, will be replaced by g5k-checks
-      pstate_driver: unknwon # Fake driver, will be replaced by g5k-checks
-      pstate_governor: unknown # Fake driver, will be replaced by g5k-checks
-      turboboost_enabled: true # Default value for turboboost, will be replaced by g5k-checks 
-    network_adapters:
-      bmc:
-        management: true
-        mac: <%= mac_bmc_list[i - 1] %>
-      eth0:
-        interface: Ethernet
-        management: false
-        driver: mlx_core # Fake data, will be replaced by g5k-checks
-        name: enp1s0f0np0 # Fake data, will be replaced by g5k-checks
-        rate: 1000000000 # Fake data, will be replaced by g5k-checks
-        mac: <%= mac_eth0_list[i - 1] %>
-    storage_devices:
-      disk0:
-        storage: SSD # Fake data, will be replaced by g5k-checks
-        model: unknown # Fake data, will be replaced by g5k-checks
-        size: 8 # Fake data, will be replaced by g5k-checks
-<% } %>
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-1.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8e24faf0449fab8e473045e2e23eea9463a42edf
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-1.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-1:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '08/28/2020'
+    vendor: Dell Inc.
+    version: 2.8.2
+  bmc_version: 4.20.20.20
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: D8WPCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.25
+      mac: 50:9a:4c:6c:32:83
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x80000ec9, 18.0.17
+      interface: Ethernet
+      ip: 172.16.130.25
+      mac: 50:9a:4c:6c:38:af
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2f41'
+      interface: InfiniBand
+      ip: 172.18.130.25
+      mac: ec:0d:9a:03:00:1d:2f:41
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3c2504"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-10.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-10.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..53df280d84beccdc8062e4bc2078fcbaeb760294
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-10.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-10:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F34SCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.34
+      mac: 50:9a:4c:70:f7:cc
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.34
+      mac: 50:9a:4c:70:fa:3c
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2d81'
+      interface: InfiniBand
+      ip: 172.18.130.34
+      mac: ec:0d:9a:03:00:1d:2d:81
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3b5f18"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-11.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-11.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ed12138bcaefd2150f17137e4ccd5bf8c4348321
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-11.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-11:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F33WCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.35
+      mac: 50:9a:4c:70:f6:4c
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.35
+      mac: 50:9a:4c:70:fa:7c
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2e81'
+      interface: InfiniBand
+      ip: 172.18.130.35
+      mac: ec:0d:9a:03:00:1d:2e:81
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3cab98"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-12.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-12.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..632b530fe1be1f5f0ad2b3aa93ec2cb1a8e72ca9
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-12.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-12:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F35NCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.36
+      mac: 50:9a:4c:70:a4:06
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.36
+      mac: 50:9a:4c:70:aa:e1
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2d91'
+      interface: InfiniBand
+      ip: 172.18.130.36
+      mac: ec:0d:9a:03:00:1d:2d:91
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3bc228"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-13.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-13.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9ac953ca86b0da0c8df999531b3b0497f629d80f
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-13.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-13:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F2XQCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.37
+      mac: 50:9a:4c:6c:32:77
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.37
+      mac: 50:9a:4c:6c:38:ad
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2d71'
+      interface: InfiniBand
+      ip: 172.18.130.37
+      mac: ec:0d:9a:03:00:1d:2d:71
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3c1504"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-14.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-14.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..78f23f46f569404cd20020267b7fa704d92db40d
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-14.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-14:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F2YPCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.38
+      mac: 50:9a:4c:6c:30:eb
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.38
+      mac: 50:9a:4c:6c:38:6b
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2ec1'
+      interface: InfiniBand
+      ip: 172.18.130.38
+      mac: ec:0d:9a:03:00:1d:2e:c1
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3be804"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-15.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-15.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3f00ae2b27e76d6c9df46b71a02aa67b2017aa71
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-15.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-15:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F2ZMCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.39
+      mac: 50:9a:4c:6c:37:87
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.39
+      mac: 50:9a:4c:6c:39:85
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2da1'
+      interface: InfiniBand
+      ip: 172.18.130.39
+      mac: ec:0d:9a:03:00:1d:2d:a1
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3c523c"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-16.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-16.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..251ffb8afa4d6a9de125b7cf0830c9bc3de83793
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-16.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-16:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F2ZSCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.40
+      mac: 50:9a:4c:6c:37:9f
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.40
+      mac: 50:9a:4c:6c:39:89
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2f51'
+      interface: InfiniBand
+      ip: 172.18.130.40
+      mac: ec:0d:9a:03:00:1d:2f:51
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3c4fa0"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-2.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e0be708141c79346786fabf8c77b6496f2b3d880
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-2.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-2:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: D8WRCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.26
+      mac: 50:9a:4c:6c:37:75
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.26
+      mac: 50:9a:4c:6c:39:82
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2ff1'
+      interface: InfiniBand
+      ip: 172.18.130.26
+      mac: ec:0d:9a:03:00:1d:2f:f1
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3c2124"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-3.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..434ec13a9b4303ceced5728106d3d035b7873dea
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-3.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-3:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: D8WTCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.27
+      mac: 50:9a:4c:6c:33:7f
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.27
+      mac: 50:9a:4c:6c:38:d9
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2e91'
+      interface: InfiniBand
+      ip: 172.18.130.27
+      mac: ec:0d:9a:03:00:1d:2e:91
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3c8254"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-4.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-4.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..14fe395fc36d5bdbddf3ac48c2038b2376e3e048
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-4.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-4:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: D8WWCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.28
+      mac: 50:9a:4c:6c:36:5b
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.28
+      mac: 50:9a:4c:6c:39:53
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2fd1'
+      interface: InfiniBand
+      ip: 172.18.130.28
+      mac: ec:0d:9a:03:00:1d:2f:d1
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3be934"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-5.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-5.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fabb3697e017e469b43b9da6235a5a33ba94c8e8
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-5.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-5:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F30TCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.29
+      mac: 50:9a:4c:6c:32:1d
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.29
+      mac: 50:9a:4c:6c:38:9e
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d3001'
+      interface: InfiniBand
+      ip: 172.18.130.29
+      mac: ec:0d:9a:03:00:1d:30:01
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3c8228"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-6.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3a07d5da04a825284bfcf9fbd16878df3ca9c5c5
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-6.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-6:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F31QCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.30
+      mac: 50:9a:4c:6c:35:8f
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.30
+      mac: 50:9a:4c:6c:39:31
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d2fe1'
+      interface: InfiniBand
+      ip: 172.18.130.30
+      mac: ec:0d:9a:03:00:1d:2f:e1
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3c52ac"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-7.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-7.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..39dd4f9a6bd52266929fdaf57b05379a34b55d02
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-7.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-7:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F31RCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.31
+      mac: 50:9a:4c:6b:54:b9
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.31
+      mac: 50:9a:4c:6b:5d:b0
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d3011'
+      interface: InfiniBand
+      ip: 172.18.130.31
+      mac: ec:0d:9a:03:00:1d:30:11
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3c8278"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-8.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-8.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..938f1a545c9437328e8751de4f6b90f73c8a13a5
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-8.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-8:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F31SCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.32
+      mac: 50:9a:4c:85:c5:28
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.32
+      mac: 50:9a:4c:85:c8:15
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a0300f66fd1'
+      interface: InfiniBand
+      ip: 172.18.130.32
+      mac: ec:0d:9a:03:00:f6:6f:d1
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 56000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3c2584"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-9.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-9.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5dbd7a7e28d5ed6e5263b99e9fcb954726a8a53c
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-9.yaml
@@ -0,0 +1,116 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour3-9:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 20
+    nb_procs: 2
+    nb_threads: 40
+    platform_type: x86_64
+  bios:
+    release_date: '09/19/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6420
+    serial: F33RCM2
+  main_memory:
+    ram_size: 206158430208
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.130.33
+      mac: 50:9a:4c:70:f6:58
+      management: true
+    eth0:
+      driver: igb
+      firmware_version: 1.67, 0x800010e5, 22.5.7
+      interface: Ethernet
+      ip: 172.16.130.33
+      mac: 50:9a:4c:70:fa:7a
+      management: false
+      model: I350 Gigabit Network Connection
+      name: enp1s0f0np0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.40.5048
+      guid: '0xec0d9a03001d3811'
+      interface: InfiniBand
+      ip: 172.18.130.33
+      mac: ec:0d:9a:03:00:1d:38:11
+      management: false
+      model: MT27500 Family [ConnectX-3]
+      name: ib0
+      rate: 40000000000
+      vendor: Mellanox Technologies
+  operating_system:
+    cstate_driver: intel_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: intel_pstate
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 1048576
+    cache_l3: 14417920
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x2007006'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Silver 4114 CPU @ 2.20GHz
+    vendor: Intel
+    version: Silver 4114
+  storage_devices:
+    pci-0000:3b:00.0-sas-phy4-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x5000cca02f3c2a94"
+      by_path: "/dev/disk/by-path/pci-0000:3b:00.0-sas-phy4-lun-0"
+      firmware_version: FU45
+      model: HUC101860CSS200
+      size: 600127266816
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/networks/sw-4.yaml b/input/grid5000/sites/sophia/networks/sw-4.yaml
index 6d6314e5323cca5e2c6fbb2706c531d5030badcc..d095497d9460d3bb3e3342ddee11489c39c14f19 100644
--- a/input/grid5000/sites/sophia/networks/sw-4.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-4.yaml
@@ -106,4 +106,3 @@ sw-4:
        1:
           uid: gw
           kind: router
-
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 02d0565640c875c52ed0bb377ff95c0c476e2961..284a05f41f8fba21c2e15f00e3fa25477021ca16 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -244,6 +244,9 @@ mercantour1:
 mercantour2:
   enp1s0f0np0: eth0
   eno2: eth1
+mercantour3:
+  enp1s0f0np0: eth0
+  ibp94s0: ib0
 mercantour4:
   enp23s0f0: eth0
   enp23s0f1: eth1
diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb
index cc63885029c62fe5438535b1b6859cc2a9c8d9ab..976ddc95192e10c947909b45f9830b5b7710f421 100644
--- a/lib/refrepo/valid/data/homogeneity.yaml.erb
+++ b/lib/refrepo/valid/data/homogeneity.yaml.erb
@@ -436,6 +436,16 @@ sophia:
     - ~storage_devices.pci-0000:00:1f.2-ata-1.firmware_version
     - ~storage_devices.pci-0000:00:1f.2-ata-1.model
     - ~storage_devices.pci-0000:00:1f.2-ata-1.vendor
+  mercantour3-[1-2]:
+    - ~bios.release_date
+    - ~bios.version
+    - ~bmc_version
+    - ~network_adapters.eth0.firmware_version
+    - ~network_adapters.ib0.rate
+  mercantour3-9:
+    - ~network_adapters.ib0.rate
+  mercantour3-[11-13]:
+    - ~network_adapters.ib0.rate
   uvb-13:
     - -chassis.serial
     - ~chassis.manufacturer