diff --git a/data/grid5000/accesses/refrepo.json b/data/grid5000/accesses/refrepo.json
index f60f11decdfbd2b31f2a44f18b2792b809e41b59..ac47b6ab4567fe3c1c828898403673bef4163e40 100644
--- a/data/grid5000/accesses/refrepo.json
+++ b/data/grid5000/accesses/refrepo.json
@@ -144375,12 +144375,12 @@
                   "vendor": "HPE"
                 },
                 {
-                  "by_id": "/dev/disk/by-id/wwn-0x5000c500da49173f",
+                  "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac015",
                   "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",
+                  "model": "EG002400JWJNN",
                   "size": 2400476553216,
                   "storage": "HDD",
                   "vendor": "HPE"
@@ -145239,12 +145239,12 @@
                   "vendor": "HPE"
                 },
                 {
-                  "by_id": "/dev/disk/by-id/wwn-0x5000c500da4920a7",
+                  "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac04d",
                   "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",
+                  "model": "EG002400JWJNN",
                   "size": 2400476553216,
                   "storage": "HDD",
                   "vendor": "HPE"
@@ -146657,23 +146657,23 @@
                   "vendor": "HPE"
                 },
                 {
-                  "by_id": "/dev/disk/by-id/wwn-0x5000039c084abe5d",
+                  "by_id": "/dev/disk/by-id/wwn-0x5000c500da490927",
                   "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-0x5000039c084ac04d",
+                  "by_id": "/dev/disk/by-id/wwn-0x5000c500da49173f",
                   "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"
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 3703479ab62295c47173d7657e010e5ed2552fdb..589faf19da1c612ca1d32a4e067704e9f8edb551 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -309,12 +309,12 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da49173f",
+      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac015",
       "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",
+      "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 e06c27686022e7870d7279231dc219f4b3f0c0e0..71bf28a58c0c8fed1f8f607a528c91a2694554f6 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -309,12 +309,12 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c500da4920a7",
+      "by_id": "/dev/disk/by-id/wwn-0x5000039c084ac04d",
       "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",
+      "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 6c940bc64b7dc7ee923a70192556423f89d6f794..2ecc6820ecc59edc753ef2ad6618801fa9cf3fe2 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -287,23 +287,23 @@
       "vendor": "HPE"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5000039c084abe5d",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da490927",
       "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-0x5000039c084ac04d",
+      "by_id": "/dev/disk/by-id/wwn-0x5000c500da49173f",
       "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"
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 9617a7942dc301fcf9dccbe6dfa820504e1d0d39..f7610143ec41e9c529793b957f7ed64f3c854a38 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
@@ -184,10 +184,10 @@ fleckenstein-10:
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da49173f"
+      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac015"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4: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 5bb79af00be4642285ae5bb26238c08c2186f312..8712e1372d8ab7c4615919a097549e76b917af0f 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
@@ -184,10 +184,10 @@ fleckenstein-4:
       size: 2400476553216
       storage: HDD
     pci-0000:47:00.0-scsi-0:2:4:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000c500da4920a7"
+      by_id: "/dev/disk/by-id/wwn-0x5000039c084ac04d"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:4: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 5bd318c4c41d2f58018b35f7bf8b6c0d650c1e53..b6017f043495b22649cd63d8836fe2ccc7131c25 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
@@ -170,17 +170,17 @@ fleckenstein-9:
       size: 960197124096
       storage: SSD
     pci-0000:47:00.0-scsi-0:2:2:0:
-      by_id: "/dev/disk/by-id/wwn-0x5000039c084abe5d"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da490927"
       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-0x5000039c084ac04d"
+      by_id: "/dev/disk/by-id/wwn-0x5000c500da49173f"
       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:
diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb
index 1daf4fbbec56611b80109bbc05c9885deb1702f3..9ac6add3334475f7b2f6dec3d1ee1444d7c8003f 100644
--- a/lib/refrepo/valid/data/homogeneity.yaml.erb
+++ b/lib/refrepo/valid/data/homogeneity.yaml.erb
@@ -391,25 +391,6 @@ sophia:
   uvb-13:
     - -chassis.serial
     - ~chassis.manufacturer
-strasbourg:
-  fleckenstein-4:
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:4:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:4:0.model
-  fleckenstein-5:
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:4:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:4:0.model
-  fleckenstein-9:
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:2:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:2:0.model
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:3:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:3:0.model
-  fleckenstein-10:
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:2:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:2:0.model
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:3:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:3:0.model
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:4:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:4:0.model
 toulouse:
   montcalm-2:
     - ~bios.release_date