diff --git a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
index 1db70698c3097ab147839c95463f277f4b9137df..f1a67854aa24544037a0b062ec55563f9bc502da 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json
@@ -203,27 +203,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x500a075129de046c",
+      "by_id": "/dev/disk/by-id/wwn-0x58ce38ee20f6cc95",
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": "D3DJ004",
-      "interface": "SATA",
-      "model": "MTFDDAK960TDT",
-      "size": 960197124096,
+      "firmware_version": "B709",
+      "interface": "SAS",
+      "model": "KRM5XVUG1T92",
+      "size": 1920383410176,
       "storage": "SSD",
-      "vendor": "Micron"
+      "vendor": "Toshiba"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x58ce38ee20f6cc95",
+      "by_id": "/dev/disk/by-id/wwn-0x500a075129de046c",
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": "B709",
-      "interface": "SAS",
-      "model": "KRM5XVUG1T92",
+      "firmware_version": "D3DJ004",
+      "interface": "SATA",
+      "model": "MTFDDAK960TDT",
       "reservation": true,
-      "size": 1920383410176,
+      "size": 960197124096,
       "storage": "SSD",
-      "vendor": "Toshiba"
+      "vendor": "Micron"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
index 9fdea4e6a9afc95c940846e0c555d8d4903f8b48..c64fa5cfdf4dfd384092fbeb53673b7d8760e31a 100644
--- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
+++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json
@@ -203,27 +203,27 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x500a075129de049a",
+      "by_id": "/dev/disk/by-id/wwn-0x58ce38ee20f6cc9d",
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
       "device": "sda",
-      "firmware_version": "D3DJ004",
-      "interface": "SATA",
-      "model": "MTFDDAK960TDT",
-      "size": 960197124096,
+      "firmware_version": "B709",
+      "interface": "SAS",
+      "model": "KRM5XVUG1T92",
+      "size": 1920383410176,
       "storage": "SSD",
-      "vendor": "Micron"
+      "vendor": "Toshiba"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x58ce38ee20f6cc9d",
+      "by_id": "/dev/disk/by-id/wwn-0x500a075129de049a",
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0",
       "device": "sdb",
-      "firmware_version": "B709",
-      "interface": "SAS",
-      "model": "KRM5XVUG1T92",
+      "firmware_version": "D3DJ004",
+      "interface": "SATA",
+      "model": "MTFDDAK960TDT",
       "reservation": true,
-      "size": 1920383410176,
+      "size": 960197124096,
       "storage": "SSD",
-      "vendor": "Toshiba"
+      "vendor": "Micron"
     }
   ],
   "supported_job_types": {
diff --git a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
index 5f9d1e568354b6dc4a067727e6c5c79716518469..25e6e66a97b2cfc58286e83fcd17923ad7e852ac 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml
@@ -40,9 +40,9 @@ nodes:
         mounted: false
     storage_devices:
       sda:
-        interface: SATA
+        interface: SAS
         storage: SSD
       sdb:
-        interface: SAS
+        interface: SATA
         storage: SSD
         reservation: true
diff --git a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
index 0e07a524f14dde6b145bd6163a7de8107244cd94..e6f3e260a82e53428770851c75614be4539cfcb3 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
@@ -99,16 +99,16 @@ grouille-1:
     version: 7452
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x500a075129de046c"
-      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
-      firmware_version: D3DJ004
-      model: MTFDDAK960TDT
-      size: 960197124096
-    sdb:
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee20f6cc95"
-      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
       firmware_version: B709
       model: KRM5XVUG1T92
       size: 1920383410176
+    sdb:
+      by_id: "/dev/disk/by-id/wwn-0x500a075129de046c"
+      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
+      firmware_version: D3DJ004
+      model: MTFDDAK960TDT
+      size: 960197124096
   supported_job_types:
     virtual: amd-v
diff --git a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
index 2d30ce1203eba36b85511406e2cd2f67c87b0b8e..fcf842c375eb705aa791c94ce500ef2c477469c3 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
@@ -99,16 +99,16 @@ grouille-2:
     version: 7452
   storage_devices:
     sda:
-      by_id: "/dev/disk/by-id/wwn-0x500a075129de049a"
-      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
-      firmware_version: D3DJ004
-      model: MTFDDAK960TDT
-      size: 960197124096
-    sdb:
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee20f6cc9d"
-      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0"
       firmware_version: B709
       model: KRM5XVUG1T92
       size: 1920383410176
+    sdb:
+      by_id: "/dev/disk/by-id/wwn-0x500a075129de049a"
+      by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
+      firmware_version: D3DJ004
+      model: MTFDDAK960TDT
+      size: 960197124096
   supported_job_types:
     virtual: amd-v