diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
index 0bd3590511f66d30bea7769a12069e61aa2c0094..a6d78536e07f707e8a996b18c9e66575c6a5d709 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -287,23 +287,23 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abe95",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4908df",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk1",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac005",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da491efb",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk2",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abc6d",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD5",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JWJNN",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
index 28b3af7a2cf49630feae9ca77e2d9334845bc5aa..3703479ab62295c47173d7657e010e5ed2552fdb 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da49095f",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
index 4dbe803660fb6f1920bdebb7d001456b16b6059e..8b3921bfebb5dd94c3d135391d19054e0cb0affa 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -309,23 +309,12 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4908df",
+      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac0b9",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0",
-      "firmware_version": "HPD8",
+      "firmware_version": "HPD5",
       "id": "disk3",
       "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da491efb",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
+      "model": "EG002400JWJNN",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
index 7847c4c8cd916669c00b900aa189b34af08538fb..2403a7149035bc9b5ac8cbe9e4a8b9a4efd9ce4b 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -309,23 +309,12 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4914c3",
+      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abe5d",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0",
-      "firmware_version": "HPD8",
+      "firmware_version": "HPD5",
       "id": "disk3",
       "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da490b1f",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
+      "model": "EG002400JWJNN",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
index 80e77c658a83f52a311b9a9c396167728513fd2a..e06c27686022e7870d7279231dc219f4b3f0c0e0 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da491827",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
index 82fb6a9d32f0dd800c2cab7d81c972bd4949bc52..a28e083fbcf74bafa5755324caea087909a9a663 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -287,23 +287,23 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c18201e2d",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4914c3",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk1",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abd91",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da490b1f",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk2",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c1820250d",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD5",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JWJNN",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
index a29fb3ada91969f6b4f30c6aacadc5c6711fe563..ee5f6287b413a1bf314fd2429526f0ee35f705d5 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -309,23 +309,12 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4916c3",
+      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abf85",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0",
-      "firmware_version": "HPD8",
+      "firmware_version": "HPD5",
       "id": "disk3",
       "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da490e87",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
+      "model": "EG002400JWJNN",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
index 96375a6d46145ab3a393b7d8f71c4c0d2850930d..4cf986b303ae7636c31daecbcbeff481bcfc3ee2 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -287,23 +287,23 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac159",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4916c3",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk1",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac015",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4920a7",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0",
-      "firmware_version": "HPD5",
+      "firmware_version": "HPD8",
       "id": "disk2",
       "interface": "SAS",
-      "model": "EG002400JWJNN",
+      "model": "EG002400JXLWC",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abf85",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD5",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JWJNN",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
index 523f3010fac002d527348c6486ce658e36703050..f2c6e2967346532ae510a08ffe7029bb0789fb1c 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -309,23 +309,12 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da490927",
+      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac159",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0",
-      "firmware_version": "HPD8",
+      "firmware_version": "HPD5",
       "id": "disk3",
       "interface": "SAS",
-      "model": "EG002400JXLWC",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da491b2b",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD8",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JXLWC",
+      "model": "EG002400JWJNN",
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
index ac786298313531dcb50b457dfa871843e7cefdbc..6c940bc64b7dc7ee923a70192556423f89d6f794 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -318,17 +318,6 @@
       "size": 2400476553216,
       "storage": "HDD",
       "vendor": "HPE"
-    },
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac0b9",
-      "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0",
-      "firmware_version": "HPD5",
-      "id": "disk4",
-      "interface": "SAS",
-      "model": "EG002400JWJNN",
-      "size": 2400476553216,
-      "storage": "HDD",
-      "vendor": "HPE"
     }
   ],
   "supported_job_types": {
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
index e7e662e46bad4f015058af207cd8b8db948e554a..d48f103e38959c4a9e6f6710cf5c93ef83563c48 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
@@ -61,9 +61,6 @@ nodes:
       pci-0000:47:00.0-scsi-0:2:4:0:
         id: disk3
         interface: SAS
-      pci-0000:47:00.0-scsi-0:2:5:0:
-        id: disk4
-        interface: SAS
     software:
       standard-environment: debian11-x64-std
     management_tools:
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
index ada63f8fbd3c17deaa70a6ea777c14e9b42526dc..762beaa78b66a71988b8f1b6a689a5ea49e308fa 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
@@ -170,17 +170,17 @@ fleckenstein-1:
       size: 960197124096
       storage: SSD
     pci-0000:47:00.0-scsi-0:2:2:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084abe95"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da4908df"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:3:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac005"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da491efb"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
@@ -190,12 +190,5 @@ fleckenstein-1:
       model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084abc6d"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
index f2dada96e1c43b97d8f7aa82dd8d05c71903c4f3..9617a7942dc301fcf9dccbe6dfa820504e1d0d39 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
@@ -190,12 +190,5 @@ fleckenstein-10:
       model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da49095f"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
index 9386522a22ce966fb0361b477a1fc10922d657a4..f9b5059fe109d8bde961dab66da28412b6cc2825 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
@@ -184,17 +184,10 @@ fleckenstein-2:
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da4908df"
+      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac0b9"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da491efb"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
+      firmware_version: HPD5
+      model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
   supported_job_types:
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
index f1cbcfff70c6470f731b9cd785da947817c2d51a..1aa4301615d09c54daa21f9da9d920b78f5ad29b 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
@@ -184,17 +184,10 @@ fleckenstein-3:
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da4914c3"
+      by_id: "/dev/disk/by-id/wwn-0x5000039c084abe5d"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da490b1f"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
+      firmware_version: HPD5
+      model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
   supported_job_types:
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
index 321e0f8feb6ee2e6e74a9f7dad9c5e832374b856..5bb79af00be4642285ae5bb26238c08c2186f312 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
@@ -190,12 +190,5 @@ fleckenstein-4:
       model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da491827"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
index fba155fe06d1460b269a59b74d80523473b3cabb..426227a2b57ec29de91465f010af6735cd834e98 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
@@ -170,17 +170,17 @@ fleckenstein-5:
       size: 960197124096
       storage: SSD
     pci-0000:47:00.0-scsi-0:2:2:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c18201e2d"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da4914c3"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:3:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084abd91"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da490b1f"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
@@ -190,12 +190,5 @@ fleckenstein-5:
       model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c1820250d"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
index 53dc4b21b8e772af82b211e77b7913eb3f9cdba6..135fb56cc74a411be852dff8d592286b526f11de 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
@@ -184,17 +184,10 @@ fleckenstein-6:
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da4916c3"
+      by_id: "/dev/disk/by-id/wwn-0x5000039c084abf85"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da490e87"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
+      firmware_version: HPD5
+      model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
   supported_job_types:
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
index 601ba1f38dba688dadbbc8d8a0df8ba5353ffedc..4107b8d7d921af969ce8c82dd2a67c63b2c0289f 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
@@ -170,17 +170,17 @@ fleckenstein-7:
       size: 960197124096
       storage: SSD
     pci-0000:47:00.0-scsi-0:2:2:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac159"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da4916c3"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:3:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac015"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da4920a7"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:3:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
+      firmware_version: HPD8
+      model: EG002400JXLWC
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
@@ -190,12 +190,5 @@ fleckenstein-7:
       model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084abf85"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
index 5f482d6063c7c1782019ee9c5c83aa842fe7584e..8bccd2214126d38ecfba742ce7bc7cb697f273dd 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
@@ -184,17 +184,10 @@ fleckenstein-8:
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da490927"
+      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac159"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
-      size: 2400476553216
-      storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da491b2b"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD8
-      model: EG002400JXLWC
+      firmware_version: HPD5
+      model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
   supported_job_types:
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
index c6773761b3f792704ce1bd9b0f2e555ba39a9b17..5bd318c4c41d2f58018b35f7bf8b6c0d650c1e53 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
@@ -190,12 +190,5 @@ fleckenstein-9:
       model: EG002400JWJNN
       size: 2400476553216
       storage: HDD
-    pci-0000:47:00.0-scsi-0:2:5:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac0b9"
-      by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:5:0"
-      firmware_version: HPD5
-      model: EG002400JWJNN
-      size: 2400476553216
-      storage: HDD
   supported_job_types:
     virtual: ivt