diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
index df8902804de32d4607cae76130c89b05f95c0a3f..d231f02dddc349a2d3062498064567dfc422934a 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json
@@ -263,7 +263,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a8d",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -274,7 +274,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a68a5",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -286,7 +286,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973be828e7",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
       "interface": "SATA",
@@ -298,7 +298,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973b80345a",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
       "interface": "SATA",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
index 36d3ac7a641ddc568d2c39f1d5dd9e2e1e3a3015..e4bf174c4be32d44fa27466f32bc57a83cce6230 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json
@@ -263,7 +263,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a75",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -274,7 +274,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1ad9",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -286,7 +286,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973be828eb",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
       "interface": "SATA",
@@ -298,7 +298,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973be828e9",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
       "interface": "SATA",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
index 3f6a0dda65fb6da76a72699a7ccadf7057545b6a..5b7703071fb13781047c677daa59a6eaac5941b2 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json
@@ -263,7 +263,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1ab5",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -274,7 +274,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a99",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -286,7 +286,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973bf03b57",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
       "interface": "SATA",
@@ -298,7 +298,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973bf03b54",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
       "interface": "SATA",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
index 39391383ec0896194fb50a00b1bf1de629efe084..f8db928c6bec0ced87d0ab9548fd693a2e0821ee 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json
@@ -263,7 +263,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a68ad",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -274,7 +274,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1ac9",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -286,7 +286,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973be828f2",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
       "interface": "SATA",
@@ -298,7 +298,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973be828e6",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
       "interface": "SATA",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
index 1f89086445f0e3045a0cd5ef2aa18f2deba38b2f..b96f75099e545c6205fa79bd2841c0a1f06cd5c4 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json
@@ -263,7 +263,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1ac1",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -274,7 +274,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a81",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -286,7 +286,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973be828ea",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
       "interface": "SATA",
@@ -298,7 +298,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973be828ee",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
       "interface": "SATA",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
index c52c2ef24ff1b59e8a38699c8f523124ea0c5180..59398b746d35e8dc8fd3c23dc5c30b8e1f39a888 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json
@@ -263,7 +263,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a79",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -274,7 +274,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1ac5",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -286,7 +286,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973bf03b56",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
       "interface": "SATA",
@@ -298,7 +298,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973bf03b58",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
       "interface": "SATA",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
index c50b92644a85f8cb4e9c3b89f8d05725477d568c..483afba59517c3de393b32cc86ef10d71ee7562c 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json
@@ -263,7 +263,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a6891",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -274,7 +274,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a85",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -286,7 +286,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973be828f0",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
       "interface": "SATA",
@@ -298,7 +298,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973be828f1",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
       "interface": "SATA",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
index e9f8035133089c4a1c730600da629b4a8c04dcad..5a8312210e97ef3a51658dae6cdcd7d5c0bee395 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json
@@ -263,7 +263,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a7d",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -274,7 +274,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973c8a1a91",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "AM07",
       "interface": "SAS",
@@ -286,7 +286,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973be828f3",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "FJ3D",
       "interface": "SATA",
@@ -298,7 +298,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003973be828e8",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "FJ3D",
       "interface": "SATA",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
index 935d28cf1dd48c051137084d30b30d3573c10129..ab363958850e3f5801df37203f93599186f766fb 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
@@ -391,7 +391,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e514393",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -402,7 +402,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f9ad7",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -414,7 +414,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f9eb3",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -426,7 +426,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f88af",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -438,7 +438,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e50d4df",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -450,7 +450,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003967c8aa2d4",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
       "interface": "SAS",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
index e783cf00bbb152fcedfee2ccb56dba4a3e514e1e..db610eaed980dd5b1c4aef47e3d549a249264faa 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
@@ -391,7 +391,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e501987",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -402,7 +402,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4fd00f",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -414,7 +414,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f92df",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -426,7 +426,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f948f",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -438,7 +438,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f9127",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -450,7 +450,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003967c8aa2d0",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
       "interface": "SAS",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
index 85010de1ca0364c21e9beddbb6145bc76be3b5f2..304c11f9607302a5ef642e62cfe742779998a8a6 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
@@ -391,7 +391,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e514093",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -402,7 +402,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e513acb",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -414,7 +414,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e50d657",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -426,7 +426,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e513eb3",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -438,7 +438,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e513b07",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -450,7 +450,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003967c8aa284",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
       "interface": "SAS",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
index 1fe43dadd34bb4d912042f82002b77f1cbc17a6f..bca108c3a992ab84421db3a9e2984b03be8c4f7b 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
@@ -391,7 +391,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e513a33",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -402,7 +402,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e5261db",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -414,7 +414,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e50dd57",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -426,7 +426,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e500297",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -438,7 +438,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e5013af",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -450,7 +450,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003967c8aa634",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
       "interface": "SAS",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
index 9d0db98368ce6bb03febc0ae5d17e6676538846b..1ed64e23c1c8a41f1a53a82ee3eed8e86e5e3f4f 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
@@ -391,7 +391,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e50fa3b",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -402,7 +402,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e510f7b",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -414,7 +414,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e50ea43",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -426,7 +426,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e51440b",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -438,7 +438,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e51465f",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -450,7 +450,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003967c8aa61c",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
       "interface": "SAS",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
index 9b62449c7ef132da52449e3da82c46c227d8f0b9..21e8606e8a703b6c232246f22a9e42a0e9a3ab95 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
@@ -391,7 +391,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f8dff",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -402,7 +402,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f920f",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -414,7 +414,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f9bf3",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -426,7 +426,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f99c3",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -438,7 +438,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4fa8ff",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -450,7 +450,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003967c8aa2b0",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
       "interface": "SAS",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
index bf1d1bfcfe5af9e210e1af0bb335267105e32272..dabe03b7227a606998993022c530978917771fb0 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
@@ -391,7 +391,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e50da03",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -402,7 +402,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e50cd8f",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -414,7 +414,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e501393",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -426,7 +426,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e50d4fb",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -438,7 +438,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e501a77",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -450,7 +450,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003967c8aa608",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
       "interface": "SAS",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
index dd4bd0bd43d3e35f88646ac485f8458a771a009d..9bbaa586791dfa9e4dfce78fbdee6e78925fc603 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
@@ -391,7 +391,7 @@
   "storage_devices": [
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e509233",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0",
       "device": "sda",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -402,7 +402,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f8777",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0",
       "device": "sdb",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -414,7 +414,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4fcff7",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0",
       "device": "sdc",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -426,7 +426,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e51004b",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0",
       "device": "sdd",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -438,7 +438,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x5000c5008e4f9f5f",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0",
       "device": "sde",
       "firmware_version": "TT31",
       "interface": "SAS",
@@ -450,7 +450,7 @@
     },
     {
       "by_id": "/dev/disk/by-id/wwn-0x500003967c8aa65c",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0",
+      "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0",
       "device": "sdf",
       "firmware_version": "A4B3",
       "interface": "SAS",
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
index 10a6fabc4200d1bc1bbea6325a089937245ad1db..dba4f5f00346db4759c79fe8e30ac379f2ec8c9a 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
@@ -101,28 +101,28 @@ chifflet-1:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a8d"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a68a5"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e7"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973b80345a"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
index 4dd48cb213f18da7947dd3e9ec6059321a613fcf..5b045063cc310caab21c1a53fbae6e29f27c1354 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
@@ -101,28 +101,28 @@ chifflet-2:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a75"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ad9"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828eb"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e9"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
index 80dec0e34afbb7866a8b25f4b1910583d3d8bfa2..abdd03bf58786b1eb51c7ca94e89fde055c1968c 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
@@ -101,28 +101,28 @@ chifflet-3:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ab5"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a99"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b57"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b54"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
index b701e047db2675c692ca07036c94bec8663abb2e..50a3c99aed3f21a4f2150fa834f37a1d44d0c4e2 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
@@ -101,28 +101,28 @@ chifflet-4:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a68ad"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac9"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f2"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e6"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
index 7c1f251ba215aee10162a63819c9390a77f36516..afa5613cd249587142e7c81811d347c184d2bf57 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
@@ -101,28 +101,28 @@ chifflet-5:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac1"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a81"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828ea"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828ee"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
index 0e2c7721f4a9c22a7984c5d92de5ceade9cad53a..d14f2849f55f8eaf59978b6e3cae006e136e3f65 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
@@ -101,28 +101,28 @@ chifflet-6:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a79"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac5"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b56"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b58"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
index dade29c1c2976e7b92af8fa89ab881faf28abafd..15cb270b0f39cb3f3c353785c964f5a33c5a615b 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
@@ -101,28 +101,28 @@ chifflet-7:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a6891"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a85"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f0"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f1"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
diff --git a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
index 8f90c7b71350058736f50bab4e30f35d638e3321..3fa6989eccd0e66751142caa41bd773bfa676e1f 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
@@ -101,28 +101,28 @@ chifflet-8:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a7d"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a91"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f3"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e8"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
       model: TOSHIBA MG04ACA4
       size: 4000787030016
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
index 6e7cb983bf4004cc1078eb6a116d3959d38be862..7c17dd1ab0ab4dd1972f9d45454c8ff7f5e37910 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
@@ -116,42 +116,42 @@ grimoire-1:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514393"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9ad7"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9eb3"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f88af"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d4df"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2d4"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
index c5ef7f0c635f72a71eb5d45848382f7da609ac86..7305e1c24e042f6b28b673f1c859a4a1b9e8f331 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -116,42 +116,42 @@ grimoire-2:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501987"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fd00f"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f92df"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f948f"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9127"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2d0"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
index af10bc539831dd8a68f3391d649d8255a835ca95..c87392e6c2d1c93887deeada56a95efb26922def 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -116,42 +116,42 @@ grimoire-3:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514093"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513acb"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d657"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513eb3"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b07"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa284"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
index 1af2427225f0befae08368fb79884384db0cd567..0b89fb9e09478a767805c3813ea9a64001cbbbfe 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
@@ -116,42 +116,42 @@ grimoire-4:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513a33"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5261db"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dd57"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e500297"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5013af"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa634"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
index f9d2adbf8ae17316619cc0d76a432f717399c4f5..fcd34074ecaccaff8d18259d4667700a79f93641 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -116,42 +116,42 @@ grimoire-5:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fa3b"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510f7b"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50ea43"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51440b"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51465f"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa61c"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
index 5b0915e59be65f72a81819d65b13c1d16f7b607f..236718795bfa426f11cdd1741f48decfb06d194b 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -116,42 +116,42 @@ grimoire-6:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f8dff"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f920f"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9bf3"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f99c3"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fa8ff"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2b0"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
index 467382e1db6e5ded1c43dc25742bf26c49d7d48e..3a4786c1753b03571f8928420d8213e97a65675e 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -116,42 +116,42 @@ grimoire-7:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50da03"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50cd8f"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501393"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d4fb"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501a77"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa608"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
index 449f124a2a21811be91db1d5f9cab459207d7ba5..7ebad54e68d90cd15af677eb17a57409b13d679b 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -116,42 +116,42 @@ grimoire-8:
   storage_devices:
     sda:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e509233"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f8777"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcff7"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51004b"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9f5f"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa65c"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"
+      by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
       model: PX02SSF020
       size: 200049647616