diff --git a/data/grid5000/sites/lille/clusters/chuc/nodes/chuc-4.json b/data/grid5000/sites/lille/clusters/chuc/nodes/chuc-4.json
index b85975149134011451315f2a2e4953eabeeb3caa..be2254237afe820f58cf9675ca146c485bdff5d4 100644
--- a/data/grid5000/sites/lille/clusters/chuc/nodes/chuc-4.json
+++ b/data/grid5000/sites/lille/clusters/chuc/nodes/chuc-4.json
@@ -1,8 +1,10 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "cpu_core_numbering": "contiguous",
     "nb_cores": 32,
     "nb_procs": 1,
+    "nb_procs": 1,
     "nb_threads": 64,
     "platform_type": "x86_64"
   },
@@ -10,13 +12,20 @@
     "release_date": "07/31/2023",
     "vendor": "HPE",
     "version": "A48"
+    "release_date": "07/31/2023",
+    "vendor": "HPE",
+    "version": "A48"
   },
   "bmc_version": "2.96",
+  "bmc_version": "2.96",
   "chassis": {
     "manufactured_at": "2023-05-02",
     "manufacturer": "HPE",
     "name": "ProLiant XL645d Gen10 Plus",
     "serial": "CZ231406C9",
+    "manufacturer": "HPE",
+    "name": "ProLiant XL645d Gen10 Plus",
+    "serial": "CZ231406C9",
     "warranty_end": "2028-05-01"
   },
   "exotic": false,
@@ -90,8 +99,79 @@
       "vendor": "Nvidia"
     }
   },
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "8.0",
+      "cores": 6912,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 42949672960,
+      "microarchitecture": "Ampere",
+      "model": "A100-SXM4-40GB",
+      "performance": {
+        "fp-16": 77970000000000,
+        "fp-32": 19490000000000,
+        "fp-64": 9746000000000
+      },
+      "power_default_limit": "400.00 W",
+      "vbios_version": "92.00.36.00.04",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "8.0",
+      "cores": 6912,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia1",
+      "memory": 42949672960,
+      "microarchitecture": "Ampere",
+      "model": "A100-SXM4-40GB",
+      "performance": {
+        "fp-16": 77970000000000,
+        "fp-32": 19490000000000,
+        "fp-64": 9746000000000
+      },
+      "power_default_limit": "400.00 W",
+      "vbios_version": "92.00.36.00.04",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "8.0",
+      "cores": 6912,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia2",
+      "memory": 42949672960,
+      "microarchitecture": "Ampere",
+      "model": "A100-SXM4-40GB",
+      "performance": {
+        "fp-16": 77970000000000,
+        "fp-32": 19490000000000,
+        "fp-64": 9746000000000
+      },
+      "power_default_limit": "400.00 W",
+      "vbios_version": "92.00.36.00.04",
+      "vendor": "Nvidia"
+    },
+    "nvidia3": {
+      "compute_capability": "8.0",
+      "cores": 6912,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia3",
+      "memory": 42949672960,
+      "microarchitecture": "Ampere",
+      "model": "A100-SXM4-40GB",
+      "performance": {
+        "fp-16": 77970000000000,
+        "fp-32": 19490000000000,
+        "fp-64": 9746000000000
+      },
+      "power_default_limit": "400.00 W",
+      "vbios_version": "92.00.36.00.04",
+      "vendor": "Nvidia"
+    }
+  },
   "main_memory": {
     "ram_size": 549755813888
+    "ram_size": 549755813888
   },
   "management_tools": {
     "bmc_vendor_tool": "ipmitool",
@@ -140,13 +220,55 @@
       "size": 68719476736,
       "technology": "dram"
     }
+    {
+      "device": "dimm_proc 1 dimm 1",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 2",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 3",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 4",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 5",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 6",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 7",
+      "size": 68719476736,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 8",
+      "size": 68719476736,
+      "technology": "dram"
+    }
   ],
   "network_adapters": [
     {
       "device": "eth0",
       "driver": "mlx5_core",
+      "driver": "mlx5_core",
       "enabled": true,
       "firmware_version": "16.35.3006 (MT_0000000241)",
+      "firmware_version": "16.35.3006 (MT_0000000241)",
       "interface": "Ethernet",
       "ip": "172.16.32.4",
       "ip6": "2001:660:4406:200:1::4",
@@ -154,28 +276,40 @@
       "mac": "88:e9:a4:a4:c9:2c",
       "management": false,
       "model": "MT27800 Family [ConnectX-5]",
+      "management": false,
+      "model": "MT27800 Family [ConnectX-5]",
       "mountable": true,
       "mounted": true,
       "name": "ens15f0np0",
+      "name": "ens15f0np0",
       "network_address": "chuc-4.lille.grid5000.fr",
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 8,
+      "rate": 25000000000,
+      "sriov": true,
+      "sriov_totalvfs": 8,
       "switch": null,
       "switch_port": null,
       "vendor": "Mellanox Technologies"
+      "switch_port": null,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "eth1",
       "driver": "mlx5_core",
+      "driver": "mlx5_core",
       "enabled": false,
       "firmware_version": "16.35.3006 (MT_0000000241)",
+      "firmware_version": "16.35.3006 (MT_0000000241)",
       "interface": "Ethernet",
       "ip": "172.16.32.104",
       "kavlan": false,
       "mac": "88:e9:a4:a4:c9:2d",
       "management": false,
       "model": "MT27800 Family [ConnectX-5]",
+      "management": false,
+      "model": "MT27800 Family [ConnectX-5]",
       "mountable": false,
       "mounted": false,
       "name": "ens15f1np1",
@@ -183,6 +317,12 @@
       "sriov": true,
       "sriov_totalvfs": 8,
       "vendor": "Mellanox Technologies"
+      "mounted": false,
+      "name": "ens15f1np1",
+      "rate": 25000000000,
+      "sriov": true,
+      "sriov_totalvfs": 8,
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "bmc",
@@ -205,6 +345,14 @@
     "pstate_governor": "none",
     "turboboost_enabled": false
   },
+  "operating_system": {
+    "cstate_driver": "acpi_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "none",
+    "pstate_governor": "none",
+    "turboboost_enabled": false
+  },
   "performance": {
     "core_flops": 41600000000,
     "node_flops": 1331200000000
@@ -215,15 +363,26 @@
     "cache_l1i": 32768,
     "cache_l2": 524288,
     "cache_l3": 33554432,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 524288,
+    "cache_l3": 33554432,
     "clock_speed": 2600000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Zen 3",
     "microcode": "0xa0011d1",
     "model": "AMD EPYC",
     "other_description": "AMD EPYC 7513 32-Core Processor",
     "vendor": "AMD",
     "version": 7513
+    "microcode": "0xa0011d1",
+    "model": "AMD EPYC",
+    "other_description": "AMD EPYC 7513 32-Core Processor",
+    "vendor": "AMD",
+    "version": 7513
   },
   "software": {
     "forced-deployment-timestamp": 202007300948,
@@ -233,7 +392,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x58ce38ee2281df49",
-      "by_path": "/dev/disk/by-path/pci-0000:c8:00.0-sas-0x58ce38ee2281df4a-lun-0",
+      "by_path": "/dev/disk/by-path/pci-0000:c8:00.0-sas-0x58ce38ee2281df4a-lun-0i",
       "firmware_version": "HPD0",
       "id": "disk0",
       "interface": "SAS",
@@ -272,8 +431,44 @@
       "interface": "SAS",
       "model": "VO001920RZWUV",
       "size": 1920383410176,
+      "model": "VO001920RZWUV",
+      "size": 1920383410176,
       "storage": "SSD",
       "vendor": "HPE"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x58ce38ee2281df4d",
+      "by_path": "/dev/disk/by-path/pci-0000:c8:00.0-sas-0x58ce38ee2281df4e-lun-0",
+      "firmware_version": "HPD0",
+      "id": "disk1",
+      "interface": "SAS",
+      "model": "VO001920RZWUV",
+      "size": 1920383410176,
+      "storage": "SSD",
+      "vendor": "HPE"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x58ce38ee2281df51",
+      "by_path": "/dev/disk/by-path/pci-0000:c8:00.0-sas-0x58ce38ee2281df52-lun-0",
+      "firmware_version": "HPD0",
+      "id": "disk2",
+      "interface": "SAS",
+      "model": "VO001920RZWUV",
+      "size": 1920383410176,
+      "storage": "SSD",
+      "vendor": "HPE"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x58ce38ee2281df55",
+      "by_path": "/dev/disk/by-path/pci-0000:c8:00.0-sas-0x58ce38ee2281df56-lun-0",
+      "firmware_version": "HPD0",
+      "id": "disk3",
+      "interface": "SAS",
+      "model": "VO001920RZWUV",
+      "size": 1920383410176,
+      "storage": "SSD",
+      "vendor": "HPE"
+      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
@@ -285,6 +480,8 @@
       "testing"
     ],
     "virtual": "amd-v"
+    ],
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "chuc-4"
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 005a803470d7da48f7db8cff564cf7346417a382..df27e6238d94b2e2c689b3b1ce614198fc24729a 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -69,6 +69,8 @@ disk_vendor_model_mapping:
       - VO001920RZWUV
       - MO001920RXRRH
       - VO001600JWZJQ
+      - VO001920RZWUV
+      - MO001920RXRRH
   SATA:
     Intel:
       - SSDSCKKB240G8R