diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
index 5f6ccbc692bf247c024453d4899e7fe51cadc7c5..af000eb99054b6d19ad05c40d7a04ff14545c960 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.json
@@ -158,12 +158,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5ace42e0254c42e5",
+      "by_id": "/dev/disk/by-id/wwn-0x500a07513c09f607",
       "by_path": "/dev/disk/by-path/pci-0000:00:17.0-ata-1",
-      "firmware_version": "HPG2",
+      "firmware_version": "HPG1",
       "id": "disk0",
       "interface": "SATA",
-      "model": "VK000960GZCNF",
+      "model": "VK000960GXAWL",
       "size": 960197124096,
       "storage": "SSD",
       "vendor": "HP"
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
index af8191df91bfce258fc74a6b49c50b903b0c7dcd..7fcefc66c2b79145d60c55bb83a4139e1f061ad6 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.json
@@ -158,12 +158,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5ace42e0254c42e6",
+      "by_id": "/dev/disk/by-id/wwn-0x500a07513c09f6e9",
       "by_path": "/dev/disk/by-path/pci-0000:00:17.0-ata-1",
-      "firmware_version": "HPG2",
+      "firmware_version": "HPG1",
       "id": "disk0",
       "interface": "SATA",
-      "model": "VK000960GZCNF",
+      "model": "VK000960GXAWL",
       "size": 960197124096,
       "storage": "SSD",
       "vendor": "HP"
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
index f1d7855b743d23a1f8f8b12b8452ab28ce3e0820..8bbf6cb3e50a9fc9156674a24e685fca42952b8e 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.json
@@ -158,12 +158,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5ace42e0254c42e9",
+      "by_id": "/dev/disk/by-id/wwn-0x500a07513c09f806",
       "by_path": "/dev/disk/by-path/pci-0000:00:17.0-ata-1",
-      "firmware_version": "HPG2",
+      "firmware_version": "HPG1",
       "id": "disk0",
       "interface": "SATA",
-      "model": "VK000960GZCNF",
+      "model": "VK000960GXAWL",
       "size": 960197124096,
       "storage": "SSD",
       "vendor": "HP"
diff --git a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
index 522e8d9368b8fb413b82ef68fe8113ce461125c9..d2e46a8134b1863190043a87ab9ad5bc1f8f1361 100644
--- a/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
+++ b/data/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.json
@@ -158,12 +158,12 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x5ace42e0254c42e8",
+      "by_id": "/dev/disk/by-id/wwn-0x500a07513c09f5ab",
       "by_path": "/dev/disk/by-path/pci-0000:00:17.0-ata-1",
-      "firmware_version": "HPG2",
+      "firmware_version": "HPG1",
       "id": "disk0",
       "interface": "SATA",
-      "model": "VK000960GZCNF",
+      "model": "VK000960GXAWL",
       "size": 960197124096,
       "storage": "SSD",
       "vendor": "HP"
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.yaml
index b3a958901ff90cae26e72244370b0ed958484860..d7390fa00a80cefd23ef4a50c27837e606ffa35c 100644
--- a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.yaml
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-3.yaml
@@ -93,10 +93,10 @@ montcalm-3:
     version: Silver 4314
   storage_devices:
     pci-0000:00:17.0-ata-1:
-      by_id: "/dev/disk/by-id/wwn-0x5ace42e0254c42e5"
+      by_id: "/dev/disk/by-id/wwn-0x500a07513c09f607"
       by_path: "/dev/disk/by-path/pci-0000:00:17.0-ata-1"
-      firmware_version: HPG2
-      model: VK000960GZCNF
+      firmware_version: HPG1
+      model: VK000960GXAWL
       size: 960197124096
       storage: SSD
   supported_job_types:
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.yaml
index d933ee6f883f21845f03611655359ea2ce796b48..1da5f71a20ba8bde7b4f581188a5736793212610 100644
--- a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.yaml
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-5.yaml
@@ -93,10 +93,10 @@ montcalm-5:
     version: Silver 4314
   storage_devices:
     pci-0000:00:17.0-ata-1:
-      by_id: "/dev/disk/by-id/wwn-0x5ace42e0254c42e6"
+      by_id: "/dev/disk/by-id/wwn-0x500a07513c09f6e9"
       by_path: "/dev/disk/by-path/pci-0000:00:17.0-ata-1"
-      firmware_version: HPG2
-      model: VK000960GZCNF
+      firmware_version: HPG1
+      model: VK000960GXAWL
       size: 960197124096
       storage: SSD
   supported_job_types:
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.yaml
index d57572d8367ae4eadc2c2d9a96edbf92021e7807..ea54bae610fadfa560359008f2c13cdf833e9a2c 100644
--- a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.yaml
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-6.yaml
@@ -93,10 +93,10 @@ montcalm-6:
     version: Silver 4314
   storage_devices:
     pci-0000:00:17.0-ata-1:
-      by_id: "/dev/disk/by-id/wwn-0x5ace42e0254c42e9"
+      by_id: "/dev/disk/by-id/wwn-0x500a07513c09f806"
       by_path: "/dev/disk/by-path/pci-0000:00:17.0-ata-1"
-      firmware_version: HPG2
-      model: VK000960GZCNF
+      firmware_version: HPG1
+      model: VK000960GXAWL
       size: 960197124096
       storage: SSD
   supported_job_types:
diff --git a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.yaml b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.yaml
index 9482b034b2657f7fc88c8abc60c6bfe557b1687b..ce2b8b7ab49e76cccb4eb0160f33cbdf88be92f3 100644
--- a/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.yaml
+++ b/input/grid5000/sites/toulouse/clusters/montcalm/nodes/montcalm-8.yaml
@@ -93,10 +93,10 @@ montcalm-8:
     version: Silver 4314
   storage_devices:
     pci-0000:00:17.0-ata-1:
-      by_id: "/dev/disk/by-id/wwn-0x5ace42e0254c42e8"
+      by_id: "/dev/disk/by-id/wwn-0x500a07513c09f5ab"
       by_path: "/dev/disk/by-path/pci-0000:00:17.0-ata-1"
-      firmware_version: HPG2
-      model: VK000960GZCNF
+      firmware_version: HPG1
+      model: VK000960GXAWL
       size: 960197124096
       storage: SSD
   supported_job_types:
diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb
index 53803a250dd04b85adc42eae1ac69e3e8d23c6eb..f81d53131a395bf9810909d5a46ae16ae6a0d721 100644
--- a/lib/refrepo/valid/data/homogeneity.yaml.erb
+++ b/lib/refrepo/valid/data/homogeneity.yaml.erb
@@ -248,10 +248,3 @@ sophia:
   uvb-13:
     - -chassis.serial
     - ~chassis.manufacturer
-toulouse:
-  montcalm-[3-5]:
-    - ~storage_devices.pci-0000:00:17.0-ata-1.firmware_version
-    - ~storage_devices.pci-0000:00:17.0-ata-1.model
-  montcalm-[7-9]:
-    - ~storage_devices.pci-0000:00:17.0-ata-1.firmware_version
-    - ~storage_devices.pci-0000:00:17.0-ata-1.model