diff --git a/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-1.json b/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-1.json
index 178340e46e67a92b26fec8b47b5289d49f43782e..f79853de8c8974c0dc2461614359b02d4fefb2ac 100644
--- a/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-1.json
@@ -1,15 +1,78 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 48,
     "nb_procs": 2,
     "nb_threads": 96,
     "platform_type": "x86_64"
   },
   "bios": {
-    "vendor": "HPE"
+    "release_date": "10/29/2021",
+    "vendor": "HPE",
+    "version": "A42"
+  },
+  "bmc_version": "2.72",
+  "chassis": {
+    "manufacturer": "HPE",
+    "name": "ProLiant DL385 Gen10 Plus v2",
+    "serial": "CZ21510FPF"
   },
   "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "8.6",
+      "cores": 10752,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 47850717184,
+      "microarchitecture": "Ampere",
+      "model": "A40",
+      "performance": {
+        "fp-16": 37420000000000,
+        "fp-32": 37420000000000,
+        "fp-64": 584600000000
+      },
+      "power_default_limit": "300.00 W",
+      "vbios_version": "94.02.5C.00.03",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "8.6",
+      "cores": 10752,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia1",
+      "memory": 47850717184,
+      "microarchitecture": "Ampere",
+      "model": "A40",
+      "performance": {
+        "fp-16": 37420000000000,
+        "fp-32": 37420000000000,
+        "fp-64": 584600000000
+      },
+      "power_default_limit": "300.00 W",
+      "vbios_version": "94.02.5C.00.03",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "8.6",
+      "cores": 10752,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 47850717184,
+      "microarchitecture": "Ampere",
+      "model": "A40",
+      "performance": {
+        "fp-16": 37420000000000,
+        "fp-32": 37420000000000,
+        "fp-64": 584600000000
+      },
+      "power_default_limit": "300.00 W",
+      "vbios_version": "94.02.5C.00.03",
+      "vendor": "Nvidia"
+    }
+  },
   "main_memory": {
+    "ram_size": 549755813888
   },
   "management_tools": {
     "bmc_vendor_tool": "ipmitool",
@@ -18,30 +81,127 @@
     }
   },
   "memory_devices": [
-
+    {
+      "device": "dimm_proc 1 dimm 1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 10",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 12",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 14",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 16",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 7",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 10",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 12",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 14",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 16",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 7",
+      "size": 34359738368,
+      "technology": "dram"
+    }
   ],
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "ice",
       "enabled": true,
+      "firmware_version": "3.00 0x80008265 1.2992.0",
       "interface": "Ethernet",
       "ip": "172.16.109.22",
       "ip6": "2001:660:4406:700:e::16",
       "kavlan": false,
       "mac": "b4:96:91:c6:40:a8",
+      "management": false,
+      "model": "Ethernet Controller E810-XXV for SFP",
       "mountable": true,
       "mounted": true,
+      "name": "ens10f0",
       "network_address": "abacus22-1.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": true,
+      "sriov_totalvfs": 128,
       "switch": null,
-      "switch_port": null
+      "switch_port": null,
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "ice",
       "enabled": false,
+      "firmware_version": "3.00 0x80008265 1.2992.0",
       "interface": "Ethernet",
       "kavlan": false,
+      "mac": "b4:96:91:c6:40:a9",
+      "management": false,
+      "model": "Ethernet Controller E810-XXV for SFP",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens10f1",
+      "sriov": true,
+      "sriov_totalvfs": 128,
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
@@ -56,15 +216,33 @@
       "network_address": "abacus22-1-bmc.rennes.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "acpi_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 42400000000,
     "node_flops": 2035200000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 524288,
+    "cache_l3": 33554432,
     "clock_speed": 2650000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Zen 3",
-    "other_description": "AMD EPYC 7413 24-Core Processor"
+    "microcode": "0xa0011d1",
+    "model": "AMD EPYC",
+    "other_description": "AMD EPYC 7413 24-Core Processor",
+    "vendor": "AMD",
+    "version": 7413
   },
   "software": {
     "forced-deployment-timestamp": 202007300948,
@@ -73,23 +251,37 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x600508b1001c91e33c5321dcae73a9a1",
       "by_path": "/dev/disk/by-path/pci-0000:64:00.0-scsi-0:1:0:0",
+      "firmware_version": 4.11,
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
+      "model": "LOGICAL VOLUME",
+      "size": 1920326787072,
       "storage": "SSD",
       "vendor": "Unknown"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x50000f0b019454a0",
+      "by_path": "/dev/disk/by-path/pci-0000:64:00.0-sas-0x50000f0b019454a2-lun-0",
+      "firmware_version": "HPD4",
+      "id": "disk1",
+      "interface": "SAS",
+      "model": "VO000960JWZJF",
+      "size": 960197124096,
+      "storage": "SSD",
+      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "abacus22-1"
diff --git a/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-2.json b/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-2.json
index 1a83bfd6936bc2dc552d63387a01b3fb3ae210ca..d7633274bbcd4024cd6e43d99c0c0f1b269cd200 100644
--- a/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-2.json
+++ b/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-2.json
@@ -1,15 +1,78 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 48,
     "nb_procs": 2,
     "nb_threads": 96,
     "platform_type": "x86_64"
   },
   "bios": {
-    "vendor": "HPE"
+    "release_date": "04/20/2023",
+    "vendor": "HPE",
+    "version": "A42"
+  },
+  "bmc_version": "2.95",
+  "chassis": {
+    "manufacturer": "HPE",
+    "name": "ProLiant DL385 Gen10 Plus v2",
+    "serial": "CZ21510FPG"
   },
   "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "8.6",
+      "cores": 10752,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 47850717184,
+      "microarchitecture": "Ampere",
+      "model": "A40",
+      "performance": {
+        "fp-16": 37420000000000,
+        "fp-32": 37420000000000,
+        "fp-64": 584600000000
+      },
+      "power_default_limit": "300.00 W",
+      "vbios_version": "94.02.5C.00.03",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "8.6",
+      "cores": 10752,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia1",
+      "memory": 47850717184,
+      "microarchitecture": "Ampere",
+      "model": "A40",
+      "performance": {
+        "fp-16": 37420000000000,
+        "fp-32": 37420000000000,
+        "fp-64": 584600000000
+      },
+      "power_default_limit": "300.00 W",
+      "vbios_version": "94.02.5C.00.03",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "8.6",
+      "cores": 10752,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 47850717184,
+      "microarchitecture": "Ampere",
+      "model": "A40",
+      "performance": {
+        "fp-16": 37420000000000,
+        "fp-32": 37420000000000,
+        "fp-64": 584600000000
+      },
+      "power_default_limit": "300.00 W",
+      "vbios_version": "94.02.5C.00.03",
+      "vendor": "Nvidia"
+    }
+  },
   "main_memory": {
+    "ram_size": 549755813888
   },
   "management_tools": {
     "bmc_vendor_tool": "ipmitool",
@@ -18,30 +81,127 @@
     }
   },
   "memory_devices": [
-
+    {
+      "device": "dimm_proc 1 dimm 1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 10",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 12",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 14",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 16",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 7",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 10",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 12",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 14",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 16",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 7",
+      "size": 34359738368,
+      "technology": "dram"
+    }
   ],
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "ice",
       "enabled": true,
+      "firmware_version": "2.50 0x800077bd 1.2960.0",
       "interface": "Ethernet",
       "ip": "172.16.109.23",
       "ip6": "2001:660:4406:700:e::17",
       "kavlan": false,
       "mac": "b4:96:91:c6:40:e8",
+      "management": false,
+      "model": "Ethernet Controller E810-XXV for SFP",
       "mountable": true,
       "mounted": true,
+      "name": "ens10f0",
       "network_address": "abacus22-2.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": true,
+      "sriov_totalvfs": 128,
       "switch": null,
-      "switch_port": null
+      "switch_port": null,
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "ice",
       "enabled": false,
+      "firmware_version": "2.50 0x800077bd 1.2960.0",
       "interface": "Ethernet",
       "kavlan": false,
+      "mac": "b4:96:91:c6:40:e9",
+      "management": false,
+      "model": "Ethernet Controller E810-XXV for SFP",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens10f1",
+      "sriov": true,
+      "sriov_totalvfs": 128,
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
@@ -56,15 +216,33 @@
       "network_address": "abacus22-2-bmc.rennes.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "acpi_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 42400000000,
     "node_flops": 2035200000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 524288,
+    "cache_l3": 33554432,
     "clock_speed": 2650000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Zen 3",
-    "other_description": "AMD EPYC 7413 24-Core Processor"
+    "microcode": "0xa0011d1",
+    "model": "AMD EPYC",
+    "other_description": "AMD EPYC 7413 24-Core Processor",
+    "vendor": "AMD",
+    "version": 7413
   },
   "software": {
     "forced-deployment-timestamp": 202007300948,
@@ -73,23 +251,37 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x600508b1001cbc98c65814c3ef0caeac",
       "by_path": "/dev/disk/by-path/pci-0000:64:00.0-scsi-0:1:0:0",
+      "firmware_version": 4.11,
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
+      "model": "LOGICAL VOLUME",
+      "size": 1920326787072,
       "storage": "SSD",
       "vendor": "Unknown"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x50000f0b01945480",
+      "by_path": "/dev/disk/by-path/pci-0000:64:00.0-sas-0x50000f0b01945482-lun-0",
+      "firmware_version": "HPD4",
+      "id": "disk1",
+      "interface": "SAS",
+      "model": "VO000960JWZJF",
+      "size": 960197124096,
+      "storage": "SSD",
+      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "abacus22-2"
diff --git a/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-3.json b/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-3.json
index 86327cc3a01074697805b2df309aabbac7ae8062..83a0d1a2d446736222347111297beaca687ee808 100644
--- a/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-3.json
+++ b/data/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-3.json
@@ -1,15 +1,44 @@
 {
   "architecture": {
+    "cpu_core_numbering": "contiguous",
     "nb_cores": 48,
     "nb_procs": 2,
     "nb_threads": 96,
     "platform_type": "x86_64"
   },
   "bios": {
-    "vendor": "HPE"
+    "release_date": "12/03/2021",
+    "vendor": "HPE",
+    "version": "A42"
+  },
+  "bmc_version": "2.55",
+  "chassis": {
+    "manufacturer": "HPE",
+    "name": "ProLiant DL385 Gen10 Plus v2",
+    "serial": "CZ22030467"
   },
   "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "8.6",
+      "cores": 10752,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 47850717184,
+      "microarchitecture": "Ampere",
+      "model": "A40",
+      "performance": {
+        "fp-16": 37420000000000,
+        "fp-32": 37420000000000,
+        "fp-64": 584600000000
+      },
+      "power_default_limit": "300.00 W",
+      "vbios_version": "94.02.5C.00.03",
+      "vendor": "Nvidia"
+    }
+  },
   "main_memory": {
+    "ram_size": 549755813888
   },
   "management_tools": {
     "bmc_vendor_tool": "ipmitool",
@@ -18,30 +47,127 @@
     }
   },
   "memory_devices": [
-
+    {
+      "device": "dimm_proc 1 dimm 1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 10",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 12",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 14",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 16",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 1 dimm 7",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 10",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 12",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 14",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 16",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_proc 2 dimm 7",
+      "size": 34359738368,
+      "technology": "dram"
+    }
   ],
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "ice",
       "enabled": true,
+      "firmware_version": "2.50 0x800077bd 1.2960.0",
       "interface": "Ethernet",
       "ip": "172.16.109.24",
       "ip6": "2001:660:4406:700:e::18",
       "kavlan": false,
       "mac": "b4:96:91:c7:ef:da",
+      "management": false,
+      "model": "Ethernet Controller E810-XXV for SFP",
       "mountable": true,
       "mounted": true,
+      "name": "ens10f0",
       "network_address": "abacus22-3.rennes.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": true,
+      "sriov_totalvfs": 128,
       "switch": null,
-      "switch_port": null
+      "switch_port": null,
+      "vendor": "Intel"
     },
     {
       "device": "eth1",
+      "driver": "ice",
       "enabled": false,
+      "firmware_version": "2.50 0x800077bd 1.2960.0",
       "interface": "Ethernet",
       "kavlan": false,
+      "mac": "b4:96:91:c7:ef:db",
+      "management": false,
+      "model": "Ethernet Controller E810-XXV for SFP",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "ens10f1",
+      "sriov": true,
+      "sriov_totalvfs": 128,
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
@@ -56,15 +182,33 @@
       "network_address": "abacus22-3-bmc.rennes.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "acpi_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "acpi-cpufreq",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "performance": {
     "core_flops": 42400000000,
     "node_flops": 2035200000000
   },
   "processor": {
     "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 524288,
+    "cache_l3": 33554432,
     "clock_speed": 2650000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
     "microarchitecture": "Zen 3",
-    "other_description": "AMD EPYC 7413 24-Core Processor"
+    "microcode": "0xa0011d1",
+    "model": "AMD EPYC",
+    "other_description": "AMD EPYC 7413 24-Core Processor",
+    "vendor": "AMD",
+    "version": 7413
   },
   "software": {
     "forced-deployment-timestamp": 202007300948,
@@ -73,23 +217,37 @@
   },
   "storage_devices": [
     {
-      "by_id": "",
+      "by_id": "/dev/disk/by-id/wwn-0x600508b1001c3dcd1560a3eb98151d9e",
       "by_path": "/dev/disk/by-path/pci-0000:64:00.0-scsi-0:1:0:0",
+      "firmware_version": 4.11,
       "id": "disk0",
       "interface": "SAS",
-      "model": "unknown",
+      "model": "LOGICAL VOLUME",
+      "size": 1920326787072,
       "storage": "SSD",
       "vendor": "Unknown"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x50000f0b01938440",
+      "by_path": "/dev/disk/by-path/pci-0000:64:00.0-sas-0x50000f0b01938442-lun-0",
+      "firmware_version": "HPD4",
+      "id": "disk1",
+      "interface": "SAS",
+      "model": "VO000960JWZJF",
+      "size": 960197124096,
+      "storage": "SSD",
+      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "amd-v"
   },
   "type": "node",
   "uid": "abacus22-3"
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 75c0f2ae6d14e387d976d53d50206c88cae42abc..3156fc5d91658410f8bc9cd43afba583ee29f359 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -17,6 +17,7 @@ disk_vendor_model_mapping:
       - DELLBOSS VD
     Unknown:
       - Logical Volume
+      - LOGICAL VOLUME
       - unknown
 
   SCSI:
@@ -63,6 +64,7 @@ disk_vendor_model_mapping:
     HPE:
       - MO000960RXKRC
       - MO000960RXRQK
+      - VO000960JWZJF
   SATA:
     Intel:
       - SSDSCKKB240G8R
diff --git a/input/grid5000/sites/rennes/clusters/abacus22/abacus22.yaml b/input/grid5000/sites/rennes/clusters/abacus22/abacus22.yaml
index 4b975417b83cfe315a5faf4a8f9cdb623fd8c251..2a27d32274cdfcd6addda1bdad7236428e0bafe2 100644
--- a/input/grid5000/sites/rennes/clusters/abacus22/abacus22.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus22/abacus22.yaml
@@ -11,19 +11,10 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 0
-    architecture:
-      nb_procs: 2
-      nb_cores: 48
-      nb_threads: 96
-      platform_type: x86_64
-    bios:
-      vendor: HPE
+      max_walltime: 604800
     processor:
       microarchitecture: Zen 3
       clock_speed: 2650000000
-      other_description: AMD EPYC 7413 24-Core Processor 
-    memory_devices: []
     software:
       standard-environment: debian11-x64-std
     management_tools:
@@ -31,48 +22,33 @@ nodes:
     network_adapters:
       bmc:
         interface: Ethernet
-        management: true
         enabled: true
         mountable: false
         mounted: false
       eth0:
-        interface: Ethernet
         enabled: true
         mountable: true
         mounted: true
       eth1:
-        interface: Ethernet
         enabled: false
         mountable: false
         mounted: false
     storage_devices:
-      disk0:
+      pci-0000:64:00.0-scsi-0:1:0:0:
         id: disk0
         interface: SAS
-        storage: SSD
-        model: unknown
-        by_path: "/dev/disk/by-path/pci-0000:64:00.0-scsi-0:1:0:0"
   abacus22-1:
-    network_adapters:
-      bmc:
-        mac: 5c:ba:2c:38:d1:46 
-        ip: 172.17.109.22 
-      eth0:
-        mac: b4:96:91:c6:40:a8
-        ip: 172.16.109.22
+    storage_devices:
+      pci-0000:64:00.0-sas-0x50000f0b019454a2-lun-0:
+        id: disk1
+        interface: SAS
   abacus22-2:
-    network_adapters:
-      bmc:
-        mac: 5c:ba:2c:38:12:2a
-        ip: 172.17.109.23
-      eth0:
-        mac: b4:96:91:c6:40:e8
-        ip: 172.16.109.23
+    storage_devices:
+      pci-0000:64:00.0-sas-0x50000f0b01945482-lun-0:
+        id: disk1
+        interface: SAS
   abacus22-3:
-    network_adapters:
-      bmc:
-        mac: 5c:ba:2c:3c:79:30
-        ip: 172.17.109.24
-      eth0:
-        mac: b4:96:91:c7:ef:da
-        ip: 172.16.109.24
+    storage_devices:
+      pci-0000:64:00.0-sas-0x50000f0b01938442-lun-0:
+        id: disk1
+        interface: SAS
diff --git a/input/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-1.yaml b/input/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c5b41eedaf57fe3477cab02715038e4a00108ac8
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-1.yaml
@@ -0,0 +1,159 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+abacus22-1:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 48
+    nb_procs: 2
+    nb_threads: 96
+    platform_type: x86_64
+  bios:
+    release_date: 10/29/2021
+    vendor: HPE
+    version: A42
+  bmc_version: '2.72'
+  chassis:
+    manufacturer: HPE
+    name: ProLiant DL385 Gen10 Plus v2
+    serial: CZ21510FPF
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 47850717184
+      model: A40
+      power_default_limit: 300.00 W
+      vbios_version: 94.02.5C.00.03
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 1
+      device: "/dev/nvidia1"
+      memory: 47850717184
+      model: A40
+      power_default_limit: 300.00 W
+      vbios_version: 94.02.5C.00.03
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 47850717184
+      model: A40
+      power_default_limit: 300.00 W
+      vbios_version: 94.02.5C.00.03
+      vendor: Nvidia
+  main_memory:
+    ram_size: 549755813888
+  memory_devices:
+    dimm_proc 1 dimm 1:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 10:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 12:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 14:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 16:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 3:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 5:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 7:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 1:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 10:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 12:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 14:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 16:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 3:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 5:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 7:
+      size: 34359738368
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.109.22
+      mac: 5c:ba:2c:38:d1:46
+      management: true
+    eth0:
+      driver: ice
+      firmware_version: 3.00 0x80008265 1.2992.0
+      interface: Ethernet
+      ip: 172.16.109.22
+      mac: b4:96:91:c6:40:a8
+      management: false
+      model: Ethernet Controller E810-XXV for SFP
+      name: ens10f0
+      rate: 10000000000
+      sriov: true
+      sriov_totalvfs: 128
+      vendor: Intel
+    eth1:
+      driver: ice
+      firmware_version: 3.00 0x80008265 1.2992.0
+      interface: Ethernet
+      mac: b4:96:91:c6:40:a9
+      management: false
+      model: Ethernet Controller E810-XXV for SFP
+      name: ens10f1
+      sriov: true
+      sriov_totalvfs: 128
+      vendor: Intel
+  operating_system:
+    cstate_driver: acpi_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: acpi-cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 524288
+    cache_l3: 33554432
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xa0011d1'
+    model: AMD EPYC
+    other_description: AMD EPYC 7413 24-Core Processor
+    vendor: AMD
+    version: 7413
+  storage_devices:
+    pci-0000:64:00.0-sas-0x50000f0b019454a2-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x50000f0b019454a0"
+      by_path: "/dev/disk/by-path/pci-0000:64:00.0-sas-0x50000f0b019454a2-lun-0"
+      firmware_version: HPD4
+      model: VO000960JWZJF
+      size: 960197124096
+      storage: SSD
+    pci-0000:64:00.0-scsi-0:1:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x600508b1001c91e33c5321dcae73a9a1"
+      by_path: "/dev/disk/by-path/pci-0000:64:00.0-scsi-0:1:0:0"
+      firmware_version: 4.11
+      model: LOGICAL VOLUME
+      size: 1920326787072
+      storage: SSD
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-2.yaml b/input/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a96afd27c3979f5f7e53e05437b5090500bf244c
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-2.yaml
@@ -0,0 +1,159 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+abacus22-2:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 48
+    nb_procs: 2
+    nb_threads: 96
+    platform_type: x86_64
+  bios:
+    release_date: 04/20/2023
+    vendor: HPE
+    version: A42
+  bmc_version: '2.95'
+  chassis:
+    manufacturer: HPE
+    name: ProLiant DL385 Gen10 Plus v2
+    serial: CZ21510FPG
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 47850717184
+      model: A40
+      power_default_limit: 300.00 W
+      vbios_version: 94.02.5C.00.03
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 1
+      device: "/dev/nvidia1"
+      memory: 47850717184
+      model: A40
+      power_default_limit: 300.00 W
+      vbios_version: 94.02.5C.00.03
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 47850717184
+      model: A40
+      power_default_limit: 300.00 W
+      vbios_version: 94.02.5C.00.03
+      vendor: Nvidia
+  main_memory:
+    ram_size: 549755813888
+  memory_devices:
+    dimm_proc 1 dimm 1:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 10:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 12:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 14:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 16:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 3:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 5:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 7:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 1:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 10:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 12:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 14:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 16:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 3:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 5:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 7:
+      size: 34359738368
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.109.23
+      mac: 5c:ba:2c:38:12:2a
+      management: true
+    eth0:
+      driver: ice
+      firmware_version: 2.50 0x800077bd 1.2960.0
+      interface: Ethernet
+      ip: 172.16.109.23
+      mac: b4:96:91:c6:40:e8
+      management: false
+      model: Ethernet Controller E810-XXV for SFP
+      name: ens10f0
+      rate: 10000000000
+      sriov: true
+      sriov_totalvfs: 128
+      vendor: Intel
+    eth1:
+      driver: ice
+      firmware_version: 2.50 0x800077bd 1.2960.0
+      interface: Ethernet
+      mac: b4:96:91:c6:40:e9
+      management: false
+      model: Ethernet Controller E810-XXV for SFP
+      name: ens10f1
+      sriov: true
+      sriov_totalvfs: 128
+      vendor: Intel
+  operating_system:
+    cstate_driver: acpi_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: acpi-cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 524288
+    cache_l3: 33554432
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xa0011d1'
+    model: AMD EPYC
+    other_description: AMD EPYC 7413 24-Core Processor
+    vendor: AMD
+    version: 7413
+  storage_devices:
+    pci-0000:64:00.0-sas-0x50000f0b01945482-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x50000f0b01945480"
+      by_path: "/dev/disk/by-path/pci-0000:64:00.0-sas-0x50000f0b01945482-lun-0"
+      firmware_version: HPD4
+      model: VO000960JWZJF
+      size: 960197124096
+      storage: SSD
+    pci-0000:64:00.0-scsi-0:1:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x600508b1001cbc98c65814c3ef0caeac"
+      by_path: "/dev/disk/by-path/pci-0000:64:00.0-scsi-0:1:0:0"
+      firmware_version: 4.11
+      model: LOGICAL VOLUME
+      size: 1920326787072
+      storage: SSD
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-3.yaml b/input/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1cf6caeaf9a1cfdf72a6a73ee233539d6640800e
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/abacus22/nodes/abacus22-3.yaml
@@ -0,0 +1,143 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+abacus22-3:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 48
+    nb_procs: 2
+    nb_threads: 96
+    platform_type: x86_64
+  bios:
+    release_date: 12/03/2021
+    vendor: HPE
+    version: A42
+  bmc_version: '2.55'
+  chassis:
+    manufacturer: HPE
+    name: ProLiant DL385 Gen10 Plus v2
+    serial: CZ22030467
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 47850717184
+      model: A40
+      power_default_limit: 300.00 W
+      vbios_version: 94.02.5C.00.03
+      vendor: Nvidia
+  main_memory:
+    ram_size: 549755813888
+  memory_devices:
+    dimm_proc 1 dimm 1:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 10:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 12:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 14:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 16:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 3:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 5:
+      size: 34359738368
+      technology: dram
+    dimm_proc 1 dimm 7:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 1:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 10:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 12:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 14:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 16:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 3:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 5:
+      size: 34359738368
+      technology: dram
+    dimm_proc 2 dimm 7:
+      size: 34359738368
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.109.24
+      mac: 5c:ba:2c:3c:79:30
+      management: true
+    eth0:
+      driver: ice
+      firmware_version: 2.50 0x800077bd 1.2960.0
+      interface: Ethernet
+      ip: 172.16.109.24
+      mac: b4:96:91:c7:ef:da
+      management: false
+      model: Ethernet Controller E810-XXV for SFP
+      name: ens10f0
+      rate: 10000000000
+      sriov: true
+      sriov_totalvfs: 128
+      vendor: Intel
+    eth1:
+      driver: ice
+      firmware_version: 2.50 0x800077bd 1.2960.0
+      interface: Ethernet
+      mac: b4:96:91:c7:ef:db
+      management: false
+      model: Ethernet Controller E810-XXV for SFP
+      name: ens10f1
+      sriov: true
+      sriov_totalvfs: 128
+      vendor: Intel
+  operating_system:
+    cstate_driver: acpi_idle
+    cstate_governor: menu
+    ht_enabled: true
+    pstate_driver: acpi-cpufreq
+    pstate_governor: performance
+    turboboost_enabled: true
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 524288
+    cache_l3: 33554432
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0xa0011d1'
+    model: AMD EPYC
+    other_description: AMD EPYC 7413 24-Core Processor
+    vendor: AMD
+    version: 7413
+  storage_devices:
+    pci-0000:64:00.0-sas-0x50000f0b01938442-lun-0:
+      by_id: "/dev/disk/by-id/wwn-0x50000f0b01938440"
+      by_path: "/dev/disk/by-path/pci-0000:64:00.0-sas-0x50000f0b01938442-lun-0"
+      firmware_version: HPD4
+      model: VO000960JWZJF
+      size: 960197124096
+      storage: SSD
+    pci-0000:64:00.0-scsi-0:1:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x600508b1001c3dcd1560a3eb98151d9e"
+      by_path: "/dev/disk/by-path/pci-0000:64:00.0-scsi-0:1:0:0"
+      firmware_version: 4.11
+      model: LOGICAL VOLUME
+      size: 1920326787072
+      storage: SSD
+  supported_job_types:
+    virtual: amd-v
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index ba304ec46f8f5dcba4cb6dbafbaa55f60f932610..fc881bf1a45c42f5139c6b5f259f691d9cccd90c 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -68,6 +68,9 @@ abacus19:
 abacus21:
   eno1: eth0
   eno2: eth1
+abacus22:
+  ens10f0: eth0
+  ens10f1: eth1
 abacus25:
   ens10f0: eth0
   ens10f1: eth1