diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json
index ab7394378264fdcde35509388e5b3bbd84f66c1a..bb44af69fa79b395d112219f3f7582cacd3d7615 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json
@@ -206,15 +206,15 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x62cea7f0adc4360028fbfb46659ec30d",
+      "by_id": "/dev/disk/by-id/wwn-0x58ce38ee2144aa5d",
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
-      "firmware_version": 5.16,
+      "firmware_version": "B026",
       "id": "disk0",
       "interface": "SAS",
-      "model": "PERC H345 Front",
-      "size": 1919716163584,
+      "model": "KPM5XVUG1T92",
+      "size": 1920383410176,
       "storage": "SSD",
-      "vendor": "Dell"
+      "vendor": "Toshiba"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json
index 813a89503cba732c80fe26194e9c774cef282630..d259ec6a950cbb11b1a8809632f1db2b9a1f34a1 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json
@@ -206,15 +206,15 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x62cea7f0af7db20028fb6bcf6555fb06",
+      "by_id": "/dev/disk/by-id/wwn-0x5ace42e02522a12a",
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
-      "firmware_version": 5.16,
+      "firmware_version": "DD02",
       "id": "disk0",
       "interface": "SAS",
-      "model": "PERC H345 Front",
-      "size": 1919716163584,
+      "model": "HFS1T9G32FEH-BA1",
+      "size": 1920383410176,
       "storage": "SSD",
-      "vendor": "Dell"
+      "vendor": "Sk Hynix"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json
index bf45e9e75de4f2e566cb34017525a751fa103e88..6a519259eee65fac4c22d6c1ce24b29d01c8298f 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json
@@ -206,15 +206,15 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x62cea7f0bb1f330028fb6bd465e251ca",
+      "by_id": "/dev/disk/by-id/wwn-0x5ace42e0252d9599",
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
-      "firmware_version": 5.16,
+      "firmware_version": "DD02",
       "id": "disk0",
       "interface": "SAS",
-      "model": "PERC H345 Front",
-      "size": 1919716163584,
+      "model": "HFS1T9G32FEH-BA1",
+      "size": 1920383410176,
       "storage": "SSD",
-      "vendor": "Dell"
+      "vendor": "Sk Hynix"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json
index 5bcf5a5bd1bdae2c71928d574cae265d7f4f124e..ebb68d8b85eea3e186ed67006b6a6639ebad15d1 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json
@@ -206,15 +206,15 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x62cea7f0bb1f3b0028fb6bcf66505179",
+      "by_id": "/dev/disk/by-id/wwn-0x5ace42e0252d95a0",
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
-      "firmware_version": 5.16,
+      "firmware_version": "DD02",
       "id": "disk0",
       "interface": "SAS",
-      "model": "PERC H345 Front",
-      "size": 1919716163584,
+      "model": "HFS1T9G32FEH-BA1",
+      "size": 1920383410176,
       "storage": "SSD",
-      "vendor": "Dell"
+      "vendor": "Sk Hynix"
     }
   ],
   "supported_job_types": {
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 2558f6a1d2a2f5db93d4dc3f2e5d9264d164bb9e..395eec398845b342a3c58a8402565df9432a7ab2 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -25,6 +25,8 @@ disk_vendor_model_mapping:
       - unknown
 
   SAS:
+    Sk Hynix: 
+      - HFS1T9G32FEH-BA1
     Hitachi:
       - HUS726040ALS210
     Seagate:
@@ -45,6 +47,7 @@ disk_vendor_model_mapping:
       - MG04SCA40ENY
       - AL15SEB060NY
       - KRM5XVUG1T92
+      - KPM5XVUG1T92
     Western Digital:
       - WD6001BKHG
       - WD6002BKTG
diff --git a/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.yaml b/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.yaml
index fc10158c34a93b0296875c1b0663915dba855f85..e9d14d0a1c7a9d52416c95f0d3870e33018035f1 100644
--- a/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.yaml
@@ -107,11 +107,11 @@ gruss-1:
     version: 7352
   storage_devices:
     pci-0000:01:00.0-scsi-0:0:0:0:
-      by_id: "/dev/disk/by-id/wwn-0x62cea7f0adc4360028fbfb46659ec30d"
+      by_id: "/dev/disk/by-id/wwn-0x58ce38ee2144aa5d"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
-      firmware_version: 5.16
-      model: PERC H345 Front
-      size: 1919716163584
+      firmware_version: B026
+      model: KPM5XVUG1T92
+      size: 1920383410176
       storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.yaml b/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.yaml
index 3a960ba89de6abf0115eb45a9b79ac3812bdd846..6064bb508ecf2e483c791067d90cc394e1efbbb8 100644
--- a/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.yaml
@@ -107,11 +107,11 @@ gruss-2:
     version: 7352
   storage_devices:
     pci-0000:01:00.0-scsi-0:0:0:0:
-      by_id: "/dev/disk/by-id/wwn-0x62cea7f0af7db20028fb6bcf6555fb06"
+      by_id: "/dev/disk/by-id/wwn-0x5ace42e02522a12a"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
-      firmware_version: 5.16
-      model: PERC H345 Front
-      size: 1919716163584
+      firmware_version: DD02
+      model: HFS1T9G32FEH-BA1
+      size: 1920383410176
       storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.yaml b/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.yaml
index 1ad5e0b53353cf8253a3c773f8e6c0889fb4f89a..283a15e40776ae64adb35e3c49ed1e891122b226 100644
--- a/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.yaml
@@ -107,11 +107,11 @@ gruss-3:
     version: 7352
   storage_devices:
     pci-0000:01:00.0-scsi-0:0:0:0:
-      by_id: "/dev/disk/by-id/wwn-0x62cea7f0bb1f330028fb6bd465e251ca"
+      by_id: "/dev/disk/by-id/wwn-0x5ace42e0252d9599"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
-      firmware_version: 5.16
-      model: PERC H345 Front
-      size: 1919716163584
+      firmware_version: DD02
+      model: HFS1T9G32FEH-BA1
+      size: 1920383410176
       storage: SSD
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.yaml b/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.yaml
index 3c6b25d6d432c3da73b587b20203209b7f9317b1..6ff9a5ba7a5b6aeb879c4fb1673de1dab550fd76 100644
--- a/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.yaml
@@ -107,11 +107,11 @@ gruss-4:
     version: 7352
   storage_devices:
     pci-0000:01:00.0-scsi-0:0:0:0:
-      by_id: "/dev/disk/by-id/wwn-0x62cea7f0bb1f3b0028fb6bcf66505179"
+      by_id: "/dev/disk/by-id/wwn-0x5ace42e0252d95a0"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
-      firmware_version: 5.16
-      model: PERC H345 Front
-      size: 1919716163584
+      firmware_version: DD02
+      model: HFS1T9G32FEH-BA1
+      size: 1920383410176
       storage: SSD
   supported_job_types:
     virtual: amd-v