diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
index 86e9b1ad6d1657b1b3624d4e9b4fb1ea575648d3..237a2a05423ac4abafbd90547f8e3730489bca4e 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bbf0026d92cdd083b9106",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151ee846f",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bbf0026d92cdd08422c57",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca665883",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
index a399588cff21a429930ecdfff24a6698428e5549..2e20eeb354cac5dd00ff773dc4f872725a960992 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700e7935a0026d92cf00840cea9",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151eeb3be",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700e7935a0026d92cf108477e7f",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca664e0f",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
index 8de7486c716de6fb3b58feca9582f8ce85457de6..b40c37c7eeb1f4937572e656c15f98f5d82789b2 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700f2538d0026d92cbd08372b5f",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151f0d585",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700f2538d0026d92cbe083deb90",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca6661b7",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
index 6e8ae360a2e1358679b9da462eb82106d8ade6c0..df60325d83da56633d5aada8f8483317fa8a25cd 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700e7916d0026d92ce1083a28e8",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151f1fed9",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700e7916d0026d92ce108410cc9",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca6692df",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
index d0cd4f33a46411bd268996f937548fc7cddd0980..44aa45083c076296296a6e6a79362dde4cdc200c 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bc90026d92cd20836928f",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151ee5c16",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bc90026d92cd3083d35cf",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca6791ab",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
index 367c5d170c16294360aab2e6cfdc5936805c01fb..62039ad863c2bb096e092be3a868f51f44275cf8 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97970026d92ce40837a0dc",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151eecad9",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97970026d92ce4083ec66e",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca66774f",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
index 8191b8ea7a9000d16af1bdf7dd034e4f2078df0b..33e08cc8827f9a1baf80a5a24bdb857faf81e855 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9cdcc0026d92cfa0839e7ec",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151eeb3dc",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9cdcc0026d92cfa08410106",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca666e9b",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
index 591bb5bbdbea8e1ce5a117156a3662f8bf9d6b7a..76aee68829b622843826c1d5bb6dfec52879478e 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978c0026d92cb0083526f3",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151eeca96",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978c0026d92cb1083bc89b",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca6657df",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
index b9dfc18ceaa435731c9e82c970ab593338a93297..b6f12ec5e68261b13d4411cbdb3e1ae0b53c1d3b 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9be020026d92cbc083ce78c",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151eeb056",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9be020026d92cbc08441067",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca662ebb",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
index 77cea90a046a5a2ce7af827586b30d1b33bdf73a..7392b4464504ec0e03f7ceef5ccdc64987d8b9b0 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97950026d92ce308344ec5",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151eeca87",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97950026d92ce4083b00bf",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca6653c7",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
index 487daabea1bc4e69809912c0ad7ed3fbee969818..81aa34e6016d95ab3ea325563015fb5b342a4cbc 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9cdce0026d92d0008324224",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151ee593a",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80c9cdce0026d92d010839531b",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca66add7",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
index 09ebf2e0908afcb338099c11ef6ce63659066cd5..fac63e2e750b3d5b19efa8d5f0d8e88a8dd6637c 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978e0026d92ce5083b9447",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151eeca8a",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978e0026d92ce50842b94a",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca664d07",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
index b1292ae87204a469bd657cea3e79e2fd1f6501be..e6bd459142a1c22cfa1c53facb5d8cc261767e13 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bd60026d92cbf084093bb",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151f1a33f",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25bd60026d92cc008476f38",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca66a5d3",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
index e62620f64d926d4f01fc963c9b53b86dc9470008..be06d9b74774125dab747b7dd5499d2c6d229fbd 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97ab0026d92cde0835630c",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151ee59cb",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb97ab0026d92cdf083c8655",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca664e87",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
index 04b9f4dcc691ebef9b49510ee1f51296a571d40e..3df7193a3aa3a8203637ff86bc3280fea866ee88 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978d0026d92cbe08374544",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151eeca8e",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x670b5e80cb978d0026d92cbf083e5ee5",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca66a3ff",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
index 2f0a57e07aed352d414c0e0192bba864a24fb9cd..22b724c95631d47be0f76915639b2cd6d0984787 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
@@ -213,27 +213,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25b960026d92cdf08387140",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0",
+      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4151f14f38",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": 4.3,
+      "firmware_version": "XCV1DL67",
       "interface": "SATA",
-      "model": "PERC H330 Mini",
-      "size": 479559942144,
+      "model": "SSDSC2KG480G8R",
+      "size": 480103981056,
       "storage": "SSD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Intel"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x6f402700f25b960026d92cdf083f33bb",
-      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500ca665b7f",
+      "by_path": "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": 4.3,
+      "firmware_version": "PT54",
       "interface": "SAS",
-      "model": "PERC H330 Mini",
+      "model": "ST8000NM0185",
       "reservation": true,
-      "size": 8000987201536,
+      "size": 8001563222016,
       "storage": "HDD",
-      "vendor": "Dell (Raid)"
+      "vendor": "Seagate"
     }
   ],
   "supported_job_types": {
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index dbe9ee836c4331d3c5a296615df4ceab89918b3c..995a79873e80a74f5fd55f2f727f08d8f4138578 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -6,29 +6,30 @@ disk_vendor_model_mapping:
     - Dell Express Flash NVMe PM1725 1.6TB AIC
   Dell (Raid):
     - PERC 6/i Adapter
-    - PERC H330 Mini
     - PERC H330
     - PERC H330 Adp
-    - PERC H730 Mini
+    - PERC H330 Mini
+    - PERC H710
     - PERC H710i
+    - PERC H730 Mini
     - PERC H730P Adp
-    - PERC H710
   Seagate:
-    - ST9146802SS
-    - ST600MM0006
-    - ST600MP0005
-    - ST600MM0088
-    - ST600MP0036
-    - ST1000NX0423
     - ST373207LC
     - ST373307LC
+    - ST9146802SS
     - ST9250610NS
     - ST300MP0005
+    - ST600MM0006
+    - ST600MM0088
+    - ST600MP0005
+    - ST600MP0036
     - ST1000NM0033-9ZM
+    - ST1000NX0423
     - ST1000NX0443
+    - ST2000NX0463
     - ST4000NM0295
     - ST4000NM0265-2DC
-    - ST2000NX0463
+    - ST8000NM0185
   Western Digital:
     - WDC WD2502ABYS-1
     - WDC WD2003FYYS-1
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
index 4c5b5ffdcafb4c9dbd88002e84ca849814191f4b..907519b90acf78262f1d5900b5b7c364c9e41ef9 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
@@ -100,16 +100,16 @@ grappe-1:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700f25bbf0026d92cdd083b9106"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee846f"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700f25bbf0026d92cdd08422c57"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca665883"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
index 2fd7584473c77cde6c1b1b6c3ee85738a9d3ebc4..5a03fe03cd22f90ea34ae324dc9b6166605044ea 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
@@ -100,16 +100,16 @@ grappe-10:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700e7935a0026d92cf00840cea9"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeb3be"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700e7935a0026d92cf108477e7f"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca664e0f"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
index a2779c2e581633fd60a3ccfa9132d092bea959cb..a5fee8d574d2fb967c2f491a4dac1625603c52db 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
@@ -100,16 +100,16 @@ grappe-11:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700f2538d0026d92cbd08372b5f"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f0d585"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700f2538d0026d92cbe083deb90"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca6661b7"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
index c8ce9c10ec108336417d71c6d462cf7544a591be..4fdc37e21493a72f7780bc1c576ebef4eb277347 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
@@ -100,16 +100,16 @@ grappe-12:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700e7916d0026d92ce1083a28e8"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f1fed9"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700e7916d0026d92ce108410cc9"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca6692df"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
index 611cf818a76b3aa460260be3a88471f34d06f6c6..0fcaf54040f700767be10982861cf58a708b54ae 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
@@ -100,16 +100,16 @@ grappe-13:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700f25bc90026d92cd20836928f"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee5c16"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700f25bc90026d92cd3083d35cf"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca6791ab"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
index 6aa3008fbcdd76d65476ce69d2a8892a6c4deea7..83927ea1f0fc8a1176def20bf1489d980ad3a9a0 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
@@ -100,16 +100,16 @@ grappe-14:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb97970026d92ce40837a0dc"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eecad9"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb97970026d92ce4083ec66e"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca66774f"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
index b65d4d0929e9854d75b2400d3f5a8f9de6161f95..2590a00fdf7281bfcb3ecbd338169e18253b1d66 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
@@ -100,16 +100,16 @@ grappe-15:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80c9cdcc0026d92cfa0839e7ec"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeb3dc"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80c9cdcc0026d92cfa08410106"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca666e9b"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
index 7b1c4d69812c873d6930ffe9f6fe6f0670233283..6845935e7fb845604d26f5b46ffd8acefe3dc538 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
@@ -100,16 +100,16 @@ grappe-16:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb978c0026d92cb0083526f3"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca96"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb978c0026d92cb1083bc89b"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca6657df"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
index 79695d9afde1d7a0256779089a584bf0e335a2f9..c914d7f9ee3d9614fed9a2d356a35c0211114a77 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
@@ -100,16 +100,16 @@ grappe-2:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80c9be020026d92cbc083ce78c"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeb056"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80c9be020026d92cbc08441067"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca662ebb"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
index 9c20759dd964f0ff5498ed7c5124b34ede59f6cc..c5c6b6c4bd563ebaba9cfbc1811c3fa28103cf7e 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
@@ -100,16 +100,16 @@ grappe-3:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb97950026d92ce308344ec5"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca87"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb97950026d92ce4083b00bf"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca6653c7"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
index e5cb987b6171e81c4ec915145edc9e5e180439f1..06b3132dcfbfb36981d7d9da054d579d6de0e084 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
@@ -100,16 +100,16 @@ grappe-4:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80c9cdce0026d92d0008324224"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee593a"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80c9cdce0026d92d010839531b"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca66add7"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
index 6afdb27a3f4f507d7c4aa1ceb97647a81649b0d9..0c26c544b89cee9c88383fd8743f2ef4c4aedff4 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
@@ -100,16 +100,16 @@ grappe-5:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb978e0026d92ce5083b9447"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca8a"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb978e0026d92ce50842b94a"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca664d07"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
index c676a2b736e361c254e78a1314d360171e2d5e0a..0aac95ff4920c4bc3bf8c544630bb508d8a6961d 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
@@ -100,16 +100,16 @@ grappe-6:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700f25bd60026d92cbf084093bb"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f1a33f"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700f25bd60026d92cc008476f38"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca66a5d3"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
index 50ea447672f5fdc86dac60f4e397b37f66a2f82c..d648f16cba354069f6dc52e36fa72e4dc2ad9017 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
@@ -100,16 +100,16 @@ grappe-7:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb97ab0026d92cde0835630c"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee59cb"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb97ab0026d92cdf083c8655"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca664e87"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
index fc8062af7d13dbe8a0885b262cab0d4fe88c0160..e3f73e1f9b3e604272471f162b5c59d9dac454a6 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
@@ -100,16 +100,16 @@ grappe-8:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb978d0026d92cbe08374544"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca8e"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x670b5e80cb978d0026d92cbf083e5ee5"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca66a3ff"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
index 56e37ee84e3764fcbf018d24901412a05d35aa43..0d27b7cbe7d0894a682fa5f86e5b57e4abfed0f7 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
@@ -100,16 +100,16 @@ grappe-9:
     version: Gold 5218R
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700f25b960026d92cdf08387140"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:0:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 479559942144
+      by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f14f38"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
+      firmware_version: XCV1DL67
+      model: SSDSC2KG480G8R
+      size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x6f402700f25b960026d92cdf083f33bb"
-      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:2:1:0"
-      firmware_version: 4.3
-      model: PERC H330 Mini
-      size: 8000987201536
+      by_id: "/dev/disk/by-id/wwn-0x5000c500ca665b7f"
+      by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:1:0"
+      firmware_version: PT54
+      model: ST8000NM0185
+      size: 8001563222016
   supported_job_types:
     virtual: ivt