diff --git a/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json b/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json
new file mode 100644
index 0000000000000000000000000000000000000000..42a60f2c92118f588b6789446b49bbc768f9f439
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json
@@ -0,0 +1,154 @@
+{
+  "boot_type": "bios",
+  "created_at": "Wed, 16 Apr 2025 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": false,
+  "manufactured_at": "2020-08-10",
+  "metrics": [
+    {
+      "description": "Default subset of metrics from Prometheus Node Exporter",
+      "name": "prom_default_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "id": [
+          "node_boot_time_seconds",
+          "node_cpu_scaling_frequency_hertz",
+          "node_cpu_seconds_total",
+          "node_filesystem_free_bytes",
+          "node_filesystem_size_bytes",
+          "node_load1",
+          "node_load15",
+          "node_load5",
+          "node_memory_Buffers_bytes",
+          "node_memory_Cached_bytes",
+          "node_memory_MemAvailable_bytes",
+          "node_memory_MemFree_bytes",
+          "node_memory_MemTotal_bytes",
+          "node_memory_Shmem_bytes",
+          "node_memory_SwapFree_bytes",
+          "node_memory_SwapTotal_bytes",
+          "node_network_receive_bytes_total",
+          "node_network_receive_packets_total",
+          "node_network_transmit_bytes_total",
+          "node_network_transmit_packets_total",
+          "node_procs_blocked",
+          "node_procs_running",
+          "kwollect_custom"
+        ],
+        "port": 9100,
+        "protocol": "prometheus"
+      }
+    },
+    {
+      "description": "All metrics from Prometheus Node Exporter",
+      "name": "prom_all_metrics",
+      "optional_period": 15000,
+      "period": 0,
+      "source": {
+        "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 T640",
+  "nodes_count": 4,
+  "nodes_description": "2 CPUs Intel Xeon Gold 6230R, 26 cores/CPU, 384GB RAM, 446GB HDD, 3575GB HDD, 1 x 10Gb Ethernet, 1 x 40Gb InfiniBand",
+  "priority": 202008,
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "redfish": true,
+  "type": "cluster",
+  "uid": "esterel31",
+  "warranty_end": "2027-08-10"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..c9d25725c891ea52bbc510f670ce3c19bd96867e
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
@@ -0,0 +1,256 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 52,
+    "nb_procs": 2,
+    "nb_threads": 104,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "09/14/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
+  },
+  "bmc_version": "7.00.00.171",
+  "chassis": {
+    "manufactured_at": "2020-08-10",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "36ZFW53",
+    "warranty_end": "2027-08-10"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 412316860416
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 34359738368,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+      "interface": "Ethernet",
+      "ip": "172.16.131.41",
+      "ip6": "2001:660:4406:800:4::29",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:22:4a",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "esterel31-1.sophia.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-7",
+      "switch_port": "Te1/0/2",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:22:4b",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2np1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth2",
+      "driver": "mlx4_en",
+      "enabled": false,
+      "firmware_version": "2.9.1000",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:02:c9:4f:f7:69",
+      "management": false,
+      "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+      "mountable": false,
+      "mounted": false,
+      "name": "enp137s0d1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.9.1000",
+      "guid": "0x0002c903004ff769",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.41",
+      "kavlan": false,
+      "mac": "00:02:c9:03:00:4f:f7:69",
+      "management": false,
+      "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel31-1-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.41",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:22:5a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel31-1-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel31",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 67200000000,
+    "node_flops": 3494400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 37486592,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Cascade Lake-SP",
+    "microcode": "0x5003707",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 6230R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 6230R"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025042314",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x62cea7f057823b0027de22fa315eb633",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H730P Adp",
+      "size": 479559942144,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x62cea7f057823b0027de241842718208",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SAS",
+      "model": "PERC H730P Adp",
+      "size": 3838627020800,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel31-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..050af78860f1f428aacbe68ce8b9e0acdcb7d27c
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
@@ -0,0 +1,256 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 52,
+    "nb_procs": 2,
+    "nb_threads": 104,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "09/14/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
+  },
+  "bmc_version": "7.00.00.171",
+  "chassis": {
+    "manufactured_at": "2020-08-10",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "46ZFW53",
+    "warranty_end": "2027-08-10"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 412316860416
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 34359738368,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+      "interface": "Ethernet",
+      "ip": "172.16.131.42",
+      "ip6": "2001:660:4406:800:4::2a",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:1c:1a",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "esterel31-2.sophia.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-7",
+      "switch_port": "Te1/0/3",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:1c:1b",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2np1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth2",
+      "driver": "mlx4_en",
+      "enabled": false,
+      "firmware_version": "2.9.1000",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:02:c9:4f:f8:5d",
+      "management": false,
+      "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+      "mountable": false,
+      "mounted": false,
+      "name": "enp137s0d1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.9.1000",
+      "guid": "0x0002c903004ff85d",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.42",
+      "kavlan": false,
+      "mac": "00:02:c9:03:00:4f:f8:5d",
+      "management": false,
+      "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel31-2-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.42",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:1c:2a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel31-2-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel31",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 67200000000,
+    "node_flops": 3494400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 37486592,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Cascade Lake-SP",
+    "microcode": "0x5003707",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 6230R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 6230R"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025042314",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x62cea7f057821a0027de23c231599689",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H730P Adp",
+      "size": 479559942144,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x62cea7f057821a0027de24e34284ac73",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SAS",
+      "model": "PERC H730P Adp",
+      "size": 3838627020800,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel31-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..f9aff51a7ea3b4630dd0bc13c70e6ac61ac1a059
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
@@ -0,0 +1,256 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 52,
+    "nb_procs": 2,
+    "nb_threads": 104,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "09/14/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
+  },
+  "bmc_version": "7.00.00.171",
+  "chassis": {
+    "manufactured_at": "2020-08-10",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "56ZFW53",
+    "warranty_end": "2027-08-10"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 412316860416
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 34359738368,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+      "interface": "Ethernet",
+      "ip": "172.16.131.43",
+      "ip6": "2001:660:4406:800:4::2b",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:2e:94",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "esterel31-3.sophia.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-7",
+      "switch_port": "Te1/0/5",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:2e:95",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2np1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth2",
+      "driver": "mlx4_en",
+      "enabled": false,
+      "firmware_version": "2.9.1000",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:02:c9:4f:f9:11",
+      "management": false,
+      "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+      "mountable": false,
+      "mounted": false,
+      "name": "enp137s0d1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.9.1000",
+      "guid": "0x0002c903004ff911",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.43",
+      "kavlan": false,
+      "mac": "00:02:c9:03:00:4f:f9:11",
+      "management": false,
+      "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel31-3-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.43",
+      "kavlan": false,
+      "mac": "f4:02:70:ed:2e:a4",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel31-3-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel31",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 67200000000,
+    "node_flops": 3494400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 37486592,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Cascade Lake-SP",
+    "microcode": "0x5003707",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 6230R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 6230R"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025042314",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x62cea7f05782450027de22702fff39a0",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H730P Adp",
+      "size": 479559942144,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x62cea7f05782450027de2396418ee471",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SAS",
+      "model": "PERC H730P Adp",
+      "size": 3838627020800,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel31-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..f7636072031c5fccfb23d91767763c93b9b8a76c
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
@@ -0,0 +1,256 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "round-robin",
+    "nb_cores": 52,
+    "nb_procs": 2,
+    "nb_threads": 104,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "09/14/2023",
+    "vendor": "Dell Inc.",
+    "version": "2.20.1"
+  },
+  "bmc_version": "7.00.00.171",
+  "chassis": {
+    "manufactured_at": "2020-08-10",
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "116SF73",
+    "warranty_end": "2027-08-10"
+  },
+  "exotic": false,
+  "main_memory": {
+    "ram_size": 412316860416
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 34359738368,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 34359738368,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": true,
+      "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+      "interface": "Ethernet",
+      "ip": "172.16.131.44",
+      "ip6": "2001:660:4406:800:4::2c",
+      "kavlan": false,
+      "mac": "70:b5:e8:d9:89:ac",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp1s0f0np0",
+      "network_address": "esterel31-4.sophia.grid5000.fr",
+      "rate": 10000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": "sw-7",
+      "switch_port": "Te1/0/6",
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "218.0.219.13/pkg 21.85.21.92",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "70:b5:e8:d9:89:ad",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2np1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth2",
+      "driver": "mlx4_en",
+      "enabled": false,
+      "firmware_version": "2.9.1000",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "00:02:c9:4f:f7:6d",
+      "management": false,
+      "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+      "mountable": false,
+      "mounted": false,
+      "name": "enp137s0d1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "ib0",
+      "driver": "mlx4_core",
+      "enabled": true,
+      "firmware_version": "2.9.1000",
+      "guid": "0x0002c903004ff76d",
+      "interface": "InfiniBand",
+      "ip": "172.18.131.44",
+      "kavlan": false,
+      "mac": "00:02:c9:03:00:4f:f7:6d",
+      "management": false,
+      "model": "MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter IC with PCIe 2.0 x8 5.0GT/s Interface",
+      "mountable": true,
+      "mounted": true,
+      "name": "ib0",
+      "netmask": "255.255.240.0",
+      "network_address": "esterel31-4-ib0.sophia.grid5000.fr",
+      "rate": 40000000000,
+      "vendor": "Mellanox Technologies"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.131.44",
+      "kavlan": false,
+      "mac": "70:b5:e8:d9:89:bc",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "esterel31-4-bmc.sophia.grid5000.fr"
+    }
+  ],
+  "nodeset": "esterel31",
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
+  "performance": {
+    "core_flops": 67200000000,
+    "node_flops": 3494400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 37486592,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Cascade Lake-SP",
+    "microcode": "0x5003707",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Gold 6230R CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Gold 6230R"
+  },
+  "redfish": true,
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2025042314",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x62cea7f06ee4110027de228e2f0f6028",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
+      "firmware_version": 4.3,
+      "id": "disk0",
+      "interface": "SAS",
+      "model": "PERC H730P Adp",
+      "size": 479559942144,
+      "storage": "HDD",
+      "vendor": "Dell"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x62cea7f06ee4110027de23bd411e3b36",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0",
+      "firmware_version": 4.3,
+      "id": "disk1",
+      "interface": "SAS",
+      "model": "PERC H730P Adp",
+      "size": 3838627020800,
+      "storage": "HDD",
+      "vendor": "Dell"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "ivt"
+  },
+  "type": "node",
+  "uid": "esterel31-4"
+}
\ No newline at end of file
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index c20bfcc520915fa08d82939cd60717009ef2e0fd..ff6c11a095bff18460cbac66c3265517d640fef2 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2308,6 +2308,24 @@ sites:
             chassis:
               manufactured_at: 2016-06-06
               warranty_end: 2021-06-06
+      esterel31:
+        nodes:
+          esterel31-1:
+            chassis:
+              manufactured_at: 2020-08-10
+              warranty_end: 2027-08-10
+          esterel31-2:
+            chassis:
+              manufactured_at: 2020-08-10
+              warranty_end: 2027-08-10
+          esterel31-3:
+            chassis:
+              manufactured_at: 2020-08-10
+              warranty_end: 2027-08-10
+          esterel31-4:
+            chassis:
+              manufactured_at: 2020-08-10
+              warranty_end: 2027-08-10
       esterel32:
         nodes:
           esterel32-1:
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 1a2e329fcd66eb59f7645f5bb6e9cf53a57f1486..efc3923de1640e5c2d40e2b5090cf23e02207a00 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -206,6 +206,7 @@ ipv4:
       sophia esterel29 eth0 0 0 3 35
       sophia esterel30 eth0 0 0 3 36
       sophia esterel31 eth0 0 0 3 40
+      sophia esterel31 ib0 0 0 3 40
       sophia esterel32 eth0 0 0 3 44
       sophia esterel32 ib0 0 0 3 44
       sophia esterel33 eth0 0 0 3 45
diff --git a/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml b/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cdd94f482f7b456642c65e776b7fdb2707721dee
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml
@@ -0,0 +1,53 @@
+---
+model: Dell PowerEdge T640 
+created_at: 2025-04-16
+kavlan: false
+boot_type: bios
+exotic: false
+queues:
+  - admin
+  - testing
+nodes:
+  esterel31-[1-4]:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: Cascade Lake-SP
+      clock_speed: 2_100_000_000
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
+      eth2:
+        enabled: false
+        mountable: false
+        mounted: false
+      ib0:
+        enabled: true
+        mountable: true
+        mounted: true
+        netmask: 255.255.240.0
+    storage_devices:
+      pci-0000:19:00.0-scsi-0:2:0:0:
+        id: disk0
+        interface: SAS
+      pci-0000:19:00.0-scsi-0:2:1:0:
+        id: disk1
+        interface: SAS
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: racadm
+    nodeset: esterel31
diff --git a/input/grid5000/sites/sophia/clusters/esterel31/esterel31_metrics.yaml b/input/grid5000/sites/sophia/clusters/esterel31/esterel31_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..729e9beb582834908e55a7537bd5ace8abbd1f3d
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel31/esterel31_metrics.yaml
@@ -0,0 +1,40 @@
+---
+metrics:
+  - name: prom_default_metrics
+    description: Default subset of metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
+      id:
+        - node_boot_time_seconds
+        - node_cpu_scaling_frequency_hertz
+        - node_cpu_seconds_total
+        - node_filesystem_free_bytes
+        - node_filesystem_size_bytes
+        - node_load1
+        - node_load15
+        - node_load5
+        - node_memory_Buffers_bytes
+        - node_memory_Cached_bytes
+        - node_memory_MemAvailable_bytes
+        - node_memory_MemFree_bytes
+        - node_memory_MemTotal_bytes
+        - node_memory_Shmem_bytes
+        - node_memory_SwapFree_bytes
+        - node_memory_SwapTotal_bytes
+        - node_network_receive_bytes_total
+        - node_network_receive_packets_total
+        - node_network_transmit_bytes_total
+        - node_network_transmit_packets_total
+        - node_procs_blocked
+        - node_procs_running
+        - kwollect_custom
+  - name: prom_all_metrics
+    description: All metrics from Prometheus Node Exporter
+    period: 0
+    optional_period: 15000
+    source:
+      protocol: prometheus
+      port: 9100
diff --git a/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.yaml b/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b30669cae4caa9d37d3179c558199b0e817ef240
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.yaml
@@ -0,0 +1,147 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel31-1:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 52
+    nb_procs: 2
+    nb_threads: 104
+    platform_type: x86_64
+  bios:
+    release_date: '09/14/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T640
+    serial: 36ZFW53
+  main_memory:
+    ram_size: 412316860416
+  memory_devices:
+    dimm_a1:
+      size: 34359738368
+      technology: dram
+    dimm_a2:
+      size: 34359738368
+      technology: dram
+    dimm_a3:
+      size: 34359738368
+      technology: dram
+    dimm_a4:
+      size: 34359738368
+      technology: dram
+    dimm_a5:
+      size: 34359738368
+      technology: dram
+    dimm_a6:
+      size: 34359738368
+      technology: dram
+    dimm_b1:
+      size: 34359738368
+      technology: dram
+    dimm_b2:
+      size: 34359738368
+      technology: dram
+    dimm_b3:
+      size: 34359738368
+      technology: dram
+    dimm_b4:
+      size: 34359738368
+      technology: dram
+    dimm_b5:
+      size: 34359738368
+      technology: dram
+    dimm_b6:
+      size: 34359738368
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.41
+      mac: f4:02:70:ed:22:5a
+      management: true
+    eth0:
+      driver: bnxt_en
+      firmware_version: 218.0.219.13/pkg 21.85.21.92
+      interface: Ethernet
+      ip: 172.16.131.41
+      mac: f4:02:70:ed:22:4a
+      management: false
+      model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth1:
+      driver: bnxt_en
+      firmware_version: 218.0.219.13/pkg 21.85.21.92
+      interface: Ethernet
+      mac: f4:02:70:ed:22:4b
+      management: false
+      model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+      name: eno2np1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth2:
+      driver: mlx4_en
+      firmware_version: 2.9.1000
+      interface: Ethernet
+      mac: 00:02:c9:4f:f7:69
+      management: false
+      model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+        IC with PCIe 2.0 x8 5.0GT/s Interface
+      name: enp137s0d1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Mellanox Technologies
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.9.1000
+      guid: '0x0002c903004ff769'
+      interface: InfiniBand
+      ip: 172.18.131.41
+      mac: 00:02:c9:03:00:4f:f7:69
+      management: false
+      model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+        IC with PCIe 2.0 x8 5.0GT/s Interface
+      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: 37486592
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x5003707'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Gold 6230R CPU @ 2.10GHz
+    vendor: Intel
+    version: Gold 6230R
+  storage_devices:
+    pci-0000:19:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x62cea7f057823b0027de22fa315eb633"
+      by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H730P Adp
+      size: 479559942144
+      storage: HDD
+    pci-0000:19:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x62cea7f057823b0027de241842718208"
+      by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730P Adp
+      size: 3838627020800
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.yaml b/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3682ff2283b8fe2c39f5ee57d75d81e3ab8aa861
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.yaml
@@ -0,0 +1,147 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel31-2:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 52
+    nb_procs: 2
+    nb_threads: 104
+    platform_type: x86_64
+  bios:
+    release_date: '09/14/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T640
+    serial: 46ZFW53
+  main_memory:
+    ram_size: 412316860416
+  memory_devices:
+    dimm_a1:
+      size: 34359738368
+      technology: dram
+    dimm_a2:
+      size: 34359738368
+      technology: dram
+    dimm_a3:
+      size: 34359738368
+      technology: dram
+    dimm_a4:
+      size: 34359738368
+      technology: dram
+    dimm_a5:
+      size: 34359738368
+      technology: dram
+    dimm_a6:
+      size: 34359738368
+      technology: dram
+    dimm_b1:
+      size: 34359738368
+      technology: dram
+    dimm_b2:
+      size: 34359738368
+      technology: dram
+    dimm_b3:
+      size: 34359738368
+      technology: dram
+    dimm_b4:
+      size: 34359738368
+      technology: dram
+    dimm_b5:
+      size: 34359738368
+      technology: dram
+    dimm_b6:
+      size: 34359738368
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.42
+      mac: f4:02:70:ed:1c:2a
+      management: true
+    eth0:
+      driver: bnxt_en
+      firmware_version: 218.0.219.13/pkg 21.85.21.92
+      interface: Ethernet
+      ip: 172.16.131.42
+      mac: f4:02:70:ed:1c:1a
+      management: false
+      model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth1:
+      driver: bnxt_en
+      firmware_version: 218.0.219.13/pkg 21.85.21.92
+      interface: Ethernet
+      mac: f4:02:70:ed:1c:1b
+      management: false
+      model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+      name: eno2np1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth2:
+      driver: mlx4_en
+      firmware_version: 2.9.1000
+      interface: Ethernet
+      mac: 00:02:c9:4f:f8:5d
+      management: false
+      model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+        IC with PCIe 2.0 x8 5.0GT/s Interface
+      name: enp137s0d1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Mellanox Technologies
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.9.1000
+      guid: '0x0002c903004ff85d'
+      interface: InfiniBand
+      ip: 172.18.131.42
+      mac: 00:02:c9:03:00:4f:f8:5d
+      management: false
+      model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+        IC with PCIe 2.0 x8 5.0GT/s Interface
+      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: 37486592
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x5003707'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Gold 6230R CPU @ 2.10GHz
+    vendor: Intel
+    version: Gold 6230R
+  storage_devices:
+    pci-0000:19:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x62cea7f057821a0027de23c231599689"
+      by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H730P Adp
+      size: 479559942144
+      storage: HDD
+    pci-0000:19:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x62cea7f057821a0027de24e34284ac73"
+      by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730P Adp
+      size: 3838627020800
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.yaml b/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f9b817264500b3ea442a0c039c3fc7bc6d312746
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.yaml
@@ -0,0 +1,147 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel31-3:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 52
+    nb_procs: 2
+    nb_threads: 104
+    platform_type: x86_64
+  bios:
+    release_date: '09/14/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T640
+    serial: 56ZFW53
+  main_memory:
+    ram_size: 412316860416
+  memory_devices:
+    dimm_a1:
+      size: 34359738368
+      technology: dram
+    dimm_a2:
+      size: 34359738368
+      technology: dram
+    dimm_a3:
+      size: 34359738368
+      technology: dram
+    dimm_a4:
+      size: 34359738368
+      technology: dram
+    dimm_a5:
+      size: 34359738368
+      technology: dram
+    dimm_a6:
+      size: 34359738368
+      technology: dram
+    dimm_b1:
+      size: 34359738368
+      technology: dram
+    dimm_b2:
+      size: 34359738368
+      technology: dram
+    dimm_b3:
+      size: 34359738368
+      technology: dram
+    dimm_b4:
+      size: 34359738368
+      technology: dram
+    dimm_b5:
+      size: 34359738368
+      technology: dram
+    dimm_b6:
+      size: 34359738368
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.43
+      mac: f4:02:70:ed:2e:a4
+      management: true
+    eth0:
+      driver: bnxt_en
+      firmware_version: 218.0.219.13/pkg 21.85.21.92
+      interface: Ethernet
+      ip: 172.16.131.43
+      mac: f4:02:70:ed:2e:94
+      management: false
+      model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth1:
+      driver: bnxt_en
+      firmware_version: 218.0.219.13/pkg 21.85.21.92
+      interface: Ethernet
+      mac: f4:02:70:ed:2e:95
+      management: false
+      model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+      name: eno2np1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth2:
+      driver: mlx4_en
+      firmware_version: 2.9.1000
+      interface: Ethernet
+      mac: 00:02:c9:4f:f9:11
+      management: false
+      model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+        IC with PCIe 2.0 x8 5.0GT/s Interface
+      name: enp137s0d1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Mellanox Technologies
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.9.1000
+      guid: '0x0002c903004ff911'
+      interface: InfiniBand
+      ip: 172.18.131.43
+      mac: 00:02:c9:03:00:4f:f9:11
+      management: false
+      model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+        IC with PCIe 2.0 x8 5.0GT/s Interface
+      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: 37486592
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x5003707'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Gold 6230R CPU @ 2.10GHz
+    vendor: Intel
+    version: Gold 6230R
+  storage_devices:
+    pci-0000:19:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x62cea7f05782450027de22702fff39a0"
+      by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H730P Adp
+      size: 479559942144
+      storage: HDD
+    pci-0000:19:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x62cea7f05782450027de2396418ee471"
+      by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730P Adp
+      size: 3838627020800
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.yaml b/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..625b7bdaf33f66b99b314479a47e4db7b0009c8b
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.yaml
@@ -0,0 +1,147 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+esterel31-4:
+  architecture:
+    cpu_core_numbering: round-robin
+    nb_cores: 52
+    nb_procs: 2
+    nb_threads: 104
+    platform_type: x86_64
+  bios:
+    release_date: '09/14/2023'
+    vendor: Dell Inc.
+    version: 2.20.1
+  bmc_version: 7.00.00.171
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge T640
+    serial: 116SF73
+  main_memory:
+    ram_size: 412316860416
+  memory_devices:
+    dimm_a1:
+      size: 34359738368
+      technology: dram
+    dimm_a2:
+      size: 34359738368
+      technology: dram
+    dimm_a3:
+      size: 34359738368
+      technology: dram
+    dimm_a4:
+      size: 34359738368
+      technology: dram
+    dimm_a5:
+      size: 34359738368
+      technology: dram
+    dimm_a6:
+      size: 34359738368
+      technology: dram
+    dimm_b1:
+      size: 34359738368
+      technology: dram
+    dimm_b2:
+      size: 34359738368
+      technology: dram
+    dimm_b3:
+      size: 34359738368
+      technology: dram
+    dimm_b4:
+      size: 34359738368
+      technology: dram
+    dimm_b5:
+      size: 34359738368
+      technology: dram
+    dimm_b6:
+      size: 34359738368
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.131.44
+      mac: 70:b5:e8:d9:89:bc
+      management: true
+    eth0:
+      driver: bnxt_en
+      firmware_version: 218.0.219.13/pkg 21.85.21.92
+      interface: Ethernet
+      ip: 172.16.131.44
+      mac: 70:b5:e8:d9:89:ac
+      management: false
+      model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+      name: enp1s0f0np0
+      rate: 10000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth1:
+      driver: bnxt_en
+      firmware_version: 218.0.219.13/pkg 21.85.21.92
+      interface: Ethernet
+      mac: 70:b5:e8:d9:89:ad
+      management: false
+      model: BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+      name: eno2np1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth2:
+      driver: mlx4_en
+      firmware_version: 2.9.1000
+      interface: Ethernet
+      mac: 00:02:c9:4f:f7:6d
+      management: false
+      model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+        IC with PCIe 2.0 x8 5.0GT/s Interface
+      name: enp137s0d1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Mellanox Technologies
+    ib0:
+      driver: mlx4_core
+      firmware_version: 2.9.1000
+      guid: '0x0002c903004ff76d'
+      interface: InfiniBand
+      ip: 172.18.131.44
+      mac: 00:02:c9:03:00:4f:f7:6d
+      management: false
+      model: MT25408A0-FCC-QI ConnectX, Dual Port 40Gb/s InfiniBand / 10GigE Adapter
+        IC with PCIe 2.0 x8 5.0GT/s Interface
+      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: 37486592
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x5003707'
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) Gold 6230R CPU @ 2.10GHz
+    vendor: Intel
+    version: Gold 6230R
+  storage_devices:
+    pci-0000:19:00.0-scsi-0:2:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x62cea7f06ee4110027de228e2f0f6028"
+      by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
+      firmware_version: 4.3
+      model: PERC H730P Adp
+      size: 479559942144
+      storage: HDD
+    pci-0000:19:00.0-scsi-0:2:1:0:
+      by_id: "/dev/disk/by-id/wwn-0x62cea7f06ee4110027de23bd411e3b36"
+      by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0"
+      firmware_version: 4.3
+      model: PERC H730P Adp
+      size: 3838627020800
+      storage: HDD
+  supported_job_types:
+    virtual: ivt
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index 8a5e7675b2946243a6a4d6986fd5ca74b166cc79..f96eb9375efa10db320e84ae6304afcf9507c561 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -744,7 +744,7 @@ def get_flops_per_cycle(microarch, cpu_name, cluster_uid)
     case cpu_name
     when /Silver 4110/, /Silver 4114/, /Silver 4214/, /Silver 4216/, /Gold 5218/, /Gold 5220/, /Gold 5115/, /Gold 5118/, /Gold 5120/, /Gold 5220R/
       return 16
-    when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6148/, /Gold 6154/, /Gold 6240/, /Gold 6248/, /Gold 6254/, /Gold 6240L/, /Gold 6238R/
+    when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6148/, /Gold 6154/, /Gold 6240/, /Gold 6248/, /Gold 6254/, /Gold 6240L/, /Gold 6230R/, /Gold 6238R/
       return 32
     end
     raise "Error: unknown CPU flop per cycle for #{cpu_name} (cluster #{cluster_uid}), cannot compute flops"
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 0f6230c1e204b6052d54d55599334b12b914e640..02d0565640c875c52ed0bb377ff95c0c476e2961 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -486,6 +486,11 @@ esterel27:
   enp129s0f1: eth1
   enp1s0f0np0: eth0
   ibp28s0: ib0
+esterel31:
+  enp1s0f0np0: eth0
+  eno2np1: eth1
+  enp137s0d1: eth2
+  ibp137s0: ib0
 esterel32:
   enp1s0f0np0: eth0
   eno1np0: eth0