diff --git a/data/grid5000/sites/rennes/clusters/abacus18/abacus18.json b/data/grid5000/sites/rennes/clusters/abacus18/abacus18.json
new file mode 100644
index 0000000000000000000000000000000000000000..d1e66696372e0f2dedff0ac8c3c94a62cdc6f0d5
--- /dev/null
+++ b/data/grid5000/sites/rennes/clusters/abacus18/abacus18.json
@@ -0,0 +1,16 @@
+{
+  "boot_type": "bios",
+  "created_at": "Wed, 11 Oct 2023 00:00:00 GMT",
+  "exotic": false,
+  "kavlan": false,
+  "metrics": [
+
+  ],
+  "model": "PowerEdge R7525",
+  "queues": [
+    "admin",
+    "testing"
+  ],
+  "type": "cluster",
+  "uid": "abacus18"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/abacus18/nodes/abacus18-1.json b/data/grid5000/sites/rennes/clusters/abacus18/nodes/abacus18-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..9ea78b601c73bf1bc58d329a7e9e4e6b595cfadd
--- /dev/null
+++ b/data/grid5000/sites/rennes/clusters/abacus18/nodes/abacus18-1.json
@@ -0,0 +1,322 @@
+{
+  "architecture": {
+    "cpu_core_numbering": "contiguous",
+    "nb_cores": 48,
+    "nb_procs": 2,
+    "nb_threads": 96,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "07/27/2020",
+    "vendor": "Dell Inc.",
+    "version": "1.5.5"
+  },
+  "bmc_version": "4.30.30.30",
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge R7525",
+    "serial": "4RK8T73"
+  },
+  "exotic": false,
+  "gpu_devices": {
+    "nvidia0": {
+      "compute_capability": "7.5",
+      "cores": 4608,
+      "cpu_affinity": 0,
+      "device": "/dev/nvidia0",
+      "memory": 23800578048,
+      "microarchitecture": "Turing",
+      "model": "Quadro RTX 6000",
+      "performance": {
+        "fp-16": 32620000000000,
+        "fp-32": 16310000000000,
+        "fp-64": 510000000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "90.02.4E.00.04",
+      "vendor": "Nvidia"
+    },
+    "nvidia1": {
+      "compute_capability": "7.5",
+      "cores": 4608,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia1",
+      "memory": 23800578048,
+      "microarchitecture": "Turing",
+      "model": "Quadro RTX 6000",
+      "performance": {
+        "fp-16": 32620000000000,
+        "fp-32": 16310000000000,
+        "fp-64": 510000000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "90.02.4E.00.04",
+      "vendor": "Nvidia"
+    },
+    "nvidia2": {
+      "compute_capability": "7.5",
+      "cores": 4608,
+      "cpu_affinity": 1,
+      "device": "/dev/nvidia2",
+      "memory": 23800578048,
+      "microarchitecture": "Turing",
+      "model": "Quadro RTX 6000",
+      "performance": {
+        "fp-16": 32620000000000,
+        "fp-32": 16310000000000,
+        "fp-64": 510000000000
+      },
+      "power_default_limit": "250.00 W",
+      "vbios_version": "90.02.4E.00.04",
+      "vendor": "Nvidia"
+    }
+  },
+  "main_memory": {
+    "ram_size": 274877906944
+  },
+  "management_tools": {
+    "bmc_vendor_tool": "racadm",
+    "ipmitool": {
+      "retries": 5
+    }
+  },
+  "memory_devices": [
+    {
+      "device": "dimm_a1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a7",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_a8",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b1",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b2",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b3",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b4",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b5",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b6",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b7",
+      "size": 17179869184,
+      "technology": "dram"
+    },
+    {
+      "device": "dimm_b8",
+      "size": 17179869184,
+      "technology": "dram"
+    }
+  ],
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "tg3",
+      "enabled": true,
+      "firmware_version": "FFV21.60.16 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "ip": "172.16.109.18",
+      "ip6": "2001:660:4406:700:e::12",
+      "kavlan": false,
+      "mac": "f4:02:70:b9:60:4e",
+      "management": false,
+      "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
+      "mountable": true,
+      "mounted": true,
+      "name": "enp225s0f0",
+      "network_address": "abacus18-1.rennes.grid5000.fr",
+      "rate": 1000000000,
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "switch": null,
+      "switch_port": null,
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth1",
+      "driver": "tg3",
+      "enabled": false,
+      "firmware_version": "FFV21.60.16 bc 5720-v1.39",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "f4:02:70:b9:60:4f",
+      "management": false,
+      "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe",
+      "mountable": false,
+      "mounted": false,
+      "name": "enp225s0f1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Broadcom Inc. and subsidiaries"
+    },
+    {
+      "device": "eth2",
+      "driver": "i40e",
+      "enabled": false,
+      "firmware_version": "7.10 0x800075e2 19.5.12",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "68:05:ca:ce:a4:b0",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
+      "mountable": false,
+      "mounted": false,
+      "name": "enp99s0f0",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Intel"
+    },
+    {
+      "device": "eth3",
+      "driver": "i40e",
+      "enabled": false,
+      "firmware_version": "7.10 0x800075e2 19.5.12",
+      "interface": "Ethernet",
+      "kavlan": false,
+      "mac": "68:05:ca:ce:a4:b1",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
+      "mountable": false,
+      "mounted": false,
+      "name": "enp99s0f1",
+      "sriov": false,
+      "sriov_totalvfs": 0,
+      "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.109.18",
+      "kavlan": false,
+      "mac": "70:b5:e8:de:e4:08",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "abacus18-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": 36800000000,
+    "node_flops": 1766400000000
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 524288,
+    "cache_l3": 16777216,
+    "clock_speed": 2300000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Zen 2",
+    "microcode": "0x830107a",
+    "model": "AMD EPYC",
+    "other_description": "AMD EPYC 7352 24-Core Processor",
+    "vendor": "AMD",
+    "version": 7352
+  },
+  "software": {
+    "forced-deployment-timestamp": 202007300948,
+    "postinstall-version": "1.2023092008",
+    "standard-environment": "debian11-x64-std"
+  },
+  "storage_devices": [
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4152708b36",
+      "by_path": "/dev/disk/by-path/pci-0000:41:00.0-ata-1",
+      "firmware_version": "XC31DL6R",
+      "id": "disk0",
+      "interface": "SATA",
+      "model": "SSDSCKKB240G8R",
+      "size": 240057409536,
+      "storage": "SSD",
+      "vendor": "Intel"
+    },
+    {
+      "by_id": "/dev/disk/by-id/wwn-0x500a0751297f285c",
+      "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
+      "firmware_version": "D1DF004",
+      "id": "disk1",
+      "interface": "SATA",
+      "model": "MTFDDAK960TDD",
+      "size": 960197124096,
+      "storage": "SSD",
+      "vendor": "Micron"
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "max_walltime": 0,
+    "queues": [
+      "admin",
+      "testing"
+    ],
+    "virtual": "amd-v"
+  },
+  "type": "node",
+  "uid": "abacus18-1"
+}
\ No newline at end of file
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 7098908692302d658cbc3b624cba42d8d4f0b710..3af5b0fd34cd0356bdaefc520e7793dac7346438 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -60,6 +60,7 @@ disk_vendor_model_mapping:
       - MO000960RXRQK
   SATA:
     Intel:
+      - SSDSCKKB240G8R
       - SSDSC2KG480G7R
       - SSDSC2KG480G8R
       - SSDSC2KG960G8R
@@ -73,6 +74,7 @@ disk_vendor_model_mapping:
       - VK000960GXNZB
     Micron:
       - MTFDDAK480TDN
+      - MTFDDAK960TDD
       - MTFDDAK960TDN
       - MTFDDAK960TDT
     Samsung:
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index d0b0de7f74396e5f0d5f156e1f54900fac3a2ff0..b68b1e93e3319056028b749f4481b73497d3fe98 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -69,6 +69,7 @@ ipv4:
       rennes paravance eth1 0 0 0 100
       rennes parasilo eth0 0 0 1 0
       rennes parasilo eth1 0 0 1 100
+      rennes abacus18 eth0 0 0 13 17
       rennes abacus20 eth0 0 0 13 19
       rennes abacus25 eth0 0 0 13 24
       rennes roazhon4 eth0 0 0 14 3
diff --git a/input/grid5000/sites/rennes/clusters/abacus18/abacus18.yaml b/input/grid5000/sites/rennes/clusters/abacus18/abacus18.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..aca1f486e4cb0e9963872ffcccced8c3a9b7b854
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/abacus18/abacus18.yaml
@@ -0,0 +1,50 @@
+model: PowerEdge R7525
+created_at: 2023-10-11
+kavlan: false
+boot_type: bios
+exotic: false
+queues:
+  - admin
+  - testing
+nodes:
+  abacus18-1:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+      max_walltime: 0
+    processor:
+      microarchitecture: Zen 2
+      clock_speed: 2300000000
+    software:
+      standard-environment: debian11-x64-std
+    management_tools:
+      bmc_vendor_tool: racadm
+    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
+      eth3:
+        enabled: false
+        mountable: false
+        mounted: false
+    storage_devices:
+      pci-0000:41:00.0-ata-1:
+        id: disk0
+        interface: SATA
+      pci-0000:01:00.0-scsi-0:0:0:0:
+        id: disk1
+        interface: SATA
diff --git a/input/grid5000/sites/rennes/clusters/abacus18/nodes/abacus18-1.yaml b/input/grid5000/sites/rennes/clusters/abacus18/nodes/abacus18-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b6d218054ec30279b81a03802b48e8a1b0156add
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/abacus18/nodes/abacus18-1.yaml
@@ -0,0 +1,181 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+abacus18-1:
+  architecture:
+    cpu_core_numbering: contiguous
+    nb_cores: 48
+    nb_procs: 2
+    nb_threads: 96
+    platform_type: x86_64
+  bios:
+    release_date: 07/27/2020
+    vendor: Dell Inc.
+    version: 1.5.5
+  bmc_version: 4.30.30.30
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R7525
+    serial: 4RK8T73
+  gpu_devices:
+    nvidia0:
+      cpu_affinity: 0
+      device: "/dev/nvidia0"
+      memory: 23800578048
+      model: Quadro RTX 6000
+      power_default_limit: 250.00 W
+      vbios_version: 90.02.4E.00.04
+      vendor: Nvidia
+    nvidia1:
+      cpu_affinity: 1
+      device: "/dev/nvidia1"
+      memory: 23800578048
+      model: Quadro RTX 6000
+      power_default_limit: 250.00 W
+      vbios_version: 90.02.4E.00.04
+      vendor: Nvidia
+    nvidia2:
+      cpu_affinity: 1
+      device: "/dev/nvidia2"
+      memory: 23800578048
+      model: Quadro RTX 6000
+      power_default_limit: 250.00 W
+      vbios_version: 90.02.4E.00.04
+      vendor: Nvidia
+  main_memory:
+    ram_size: 274877906944
+  memory_devices:
+    dimm_a1:
+      size: 17179869184
+      technology: dram
+    dimm_a2:
+      size: 17179869184
+      technology: dram
+    dimm_a3:
+      size: 17179869184
+      technology: dram
+    dimm_a4:
+      size: 17179869184
+      technology: dram
+    dimm_a5:
+      size: 17179869184
+      technology: dram
+    dimm_a6:
+      size: 17179869184
+      technology: dram
+    dimm_a7:
+      size: 17179869184
+      technology: dram
+    dimm_a8:
+      size: 17179869184
+      technology: dram
+    dimm_b1:
+      size: 17179869184
+      technology: dram
+    dimm_b2:
+      size: 17179869184
+      technology: dram
+    dimm_b3:
+      size: 17179869184
+      technology: dram
+    dimm_b4:
+      size: 17179869184
+      technology: dram
+    dimm_b5:
+      size: 17179869184
+      technology: dram
+    dimm_b6:
+      size: 17179869184
+      technology: dram
+    dimm_b7:
+      size: 17179869184
+      technology: dram
+    dimm_b8:
+      size: 17179869184
+      technology: dram
+  network_adapters:
+    bmc:
+      ip: 172.17.109.18
+      mac: 70:b5:e8:de:e4:08
+      management: true
+    eth0:
+      driver: tg3
+      firmware_version: FFV21.60.16 bc 5720-v1.39
+      interface: Ethernet
+      ip: 172.16.109.18
+      mac: f4:02:70:b9:60:4e
+      management: false
+      model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+      name: enp225s0f0
+      rate: 1000000000
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth1:
+      driver: tg3
+      firmware_version: FFV21.60.16 bc 5720-v1.39
+      interface: Ethernet
+      mac: f4:02:70:b9:60:4f
+      management: false
+      model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
+      name: enp225s0f1
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Broadcom Inc. and subsidiaries
+    eth2:
+      driver: i40e
+      firmware_version: 7.10 0x800075e2 19.5.12
+      interface: Ethernet
+      mac: 68:05:ca:ce:a4:b0
+      management: false
+      model: Ethernet Controller X710 for 10GbE SFP+
+      name: enp99s0f0
+      sriov: false
+      sriov_totalvfs: 0
+      vendor: Intel
+    eth3:
+      driver: i40e
+      firmware_version: 7.10 0x800075e2 19.5.12
+      interface: Ethernet
+      mac: 68:05:ca:ce:a4:b1
+      management: false
+      model: Ethernet Controller X710 for 10GbE SFP+
+      name: enp99s0f1
+      sriov: false
+      sriov_totalvfs: 0
+      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: 16777216
+    ht_capable: true
+    instruction_set: x86-64
+    microcode: '0x830107a'
+    model: AMD EPYC
+    other_description: AMD EPYC 7352 24-Core Processor
+    vendor: AMD
+    version: 7352
+  storage_devices:
+    pci-0000:01:00.0-scsi-0:0:0:0:
+      by_id: "/dev/disk/by-id/wwn-0x500a0751297f285c"
+      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
+      firmware_version: D1DF004
+      model: MTFDDAK960TDD
+      size: 960197124096
+      storage: SSD
+    pci-0000:41:00.0-ata-1:
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4152708b36"
+      by_path: "/dev/disk/by-path/pci-0000:41:00.0-ata-1"
+      firmware_version: XC31DL6R
+      model: SSDSCKKB240G8R
+      size: 240057409536
+      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 3b018896f7aa3f07f274b15baaaac6454753f341..825f868aad2ef49f3b2c6459839fd62497380069 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -4,6 +4,11 @@ abacus20:
   eno2np1: eth1
   enp137s0f0: eth2
   enp137s0f1: eth3
+abacus18:
+  enp225s0f0: eth0
+  enp225s0f1: eth1
+  enp99s0f0: eth2
+  enp99s0f1: eth3
 abacus25:
   ens10f0: eth0
   ens10f1: eth1