diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
index d0e892834b08ef94a5d370642abd935f69908e7f..479d4d448510cfe66f72207ab360bdc2181328b8 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
@@ -312,8 +312,8 @@
       "vendor": "Samsung"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3474",
-      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3472",
+      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0",
       "device": "sdb",
       "driver": "megaraid_sas",
       "firmware_version": "GXT5204Q",
@@ -325,8 +325,8 @@
       "vendor": "Samsung"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3472",
-      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf346b",
+      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0",
       "device": "sdc",
       "driver": "megaraid_sas",
       "firmware_version": "GXT5204Q",
@@ -338,8 +338,8 @@
       "vendor": "Samsung"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3468",
-      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3474",
+      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0",
       "device": "sdd",
       "driver": "megaraid_sas",
       "firmware_version": "GXT5204Q",
@@ -351,8 +351,8 @@
       "vendor": "Samsung"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf346b",
-      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3468",
+      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0",
       "device": "sde",
       "driver": "megaraid_sas",
       "firmware_version": "GXT5204Q",
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
index 27ca5d9b97dff3827fb2fb4c49f935cf6e7b5d7a..6ede05908fd2bd8675e74f4c0ae9ba58f9177362 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
@@ -312,8 +312,8 @@
       "vendor": "Samsung"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf345b",
-      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3462",
+      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0",
       "device": "sdb",
       "driver": "megaraid_sas",
       "firmware_version": "GXT5204Q",
@@ -325,8 +325,8 @@
       "vendor": "Samsung"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3462",
-      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3469",
+      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0",
       "device": "sdc",
       "driver": "megaraid_sas",
       "firmware_version": "GXT5204Q",
@@ -351,8 +351,8 @@
       "vendor": "Samsung"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf3469",
-      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0",
+      "by_id": "/dev/disk/by-id/wwn-0x5002538c40bf345b",
+      "by_path": "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0",
       "device": "sde",
       "driver": "megaraid_sas",
       "firmware_version": "GXT5204Q",
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
index 364a0f19c9a37a84e2d6d89178774feebbb305a3..554e6b9f81c2e9d7ddc91134f12cd4f015b6ca6a 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
@@ -190,26 +190,26 @@ gemini-1:
       model: SAMSUNG MZ7KM480
       size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3474"
-      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0"
+      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3472"
+      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
     sdc:
-      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3472"
-      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
+      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf346b"
+      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
     sdd:
-      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3468"
-      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
+      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3474"
+      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:17:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
     sde:
-      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf346b"
-      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
+      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3468"
+      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
diff --git a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
index d96b07153d49b409072d8bb6ed4bb4af22aaa05f..e0562a6ea03e27d86f6f663052ca538a568f3a11 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
@@ -190,14 +190,14 @@ gemini-2:
       model: SAMSUNG MZ7KM480
       size: 480103981056
     sdb:
-      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf345b"
-      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
+      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3462"
+      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
     sdc:
-      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3462"
-      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:15:0"
+      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3469"
+      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
@@ -208,8 +208,8 @@ gemini-2:
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
     sde:
-      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf3469"
-      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:16:0"
+      by_id: "/dev/disk/by-id/wwn-0x5002538c40bf345b"
+      by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:18:0"
       firmware_version: GXT5204Q
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176