diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
index 95c7267c889cf45c647dc90d1d69f3f5f58fb3ac..d7b3a514f4a20d49b324209b682dcd24a708617a 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee2b1bb39c5",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
index c97dc999cb33234e4512fe5835f2bec2e22332c5..b72235d70b008b285bd5b51f3e5b63c044ae287e 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee207107ae8",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
index d728197c6891ede3e3768d461d01f7b9ca97bff8..a19494315dc41ac4650cbf4b461cdd9f8fe3c36a 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee2b1bb4a6d",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
index 781ab1b7301f936801cf2adb1f78e5be3da10442..3ef29c07895cfc104d4efba1b1d248670e384307 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee25c65a85b",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
index a8947e268203d7a12f4c71694ebdaf52c1f1dbaa..3974fa9ebc7736bfd4e96e371ec82a724cfa530b 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee2b1ba5d63",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
index f8d4ac60770bb027d5831f95f1c471412e5ee3f1..a651e0b39fc5f2eaebe96d7074f7c199029b4501 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee207106c19",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
index d81ca3a06d43df0d11befb231e2b374811fc0cd6..504ea86389b5e415bff070f3026931e360355365 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee25c659979",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
index 8d78af899a11a9c9232e288538baf49bcb77bc37..e53cbe754597416479342140ca3b1d73c66bcdb4 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee25c64d23d",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
index 14ed9ea66b479b7a9fefccb3949add170af9473f..0861561364f4e772e11e876b18481d3106de86d9 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee25c6594dc",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
index b1f627efdaf4e7f9b6be7d9fa88d16030b27442e..63a771ea1b23ca5310bf5129ca72883d20277245 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee2b1ba84f1",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
index f5b4a0363e32a4ca710838d565d8fcc1fff281ed..64aa91735bf3780d2abbe695cad00a523a16a336 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee25c655ff4",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D02",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
index e2502335524de22dcfdc8c50e2195b042bed757e..23061cf4452f8b4a91221504a9b600acab68c743 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee2b1bb4095",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
index 18304ff0e80fa5ba2118b23d159666e50ff503bb..2cc2625fdb95f5b588fbb7f911420460bcf36faf 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee25c658eea",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D02",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
index 1e4b6d7cd7d145e0377c660b33a7b8f2ba90ecbf..88454bcd37ea9162786791252d5f56b73a62c030 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee207106833",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D02",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
index 405da7b0d6a372ae9ab2acd5d70ac9cd76ea8daf..22e7d2c83af6669feb03d3471f70f3891bd6291b 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee2071063ca",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D02",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
index cbf3ddb49686eb2817e8a4c69e0d7f0b39b7071b..b393e636d8d9c9a21c5d5825ddedd8bbbceb3488 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee25c659502",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
index fd7e7c0a019894ce59f6863311e5916c2d14cecc..7516b74be23fedc694ee12f0f2887eb5eede763d 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee25c65918c",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
index 6ab81e5cab85a14cf243a7ba03e6cecea69b878a..6bc7ab49cd2582d631bed4a36407e09a9eefee37 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee25c658e9c",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
index 66211f3ab1a6868fd14adf64aeb95caf5a78d0b3..947951e53bed090b5fbb855d70297634be51fce2 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee207107f8d",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
index 01e21a079fef4f896e13eb4de5fb432b436cfb40..30992772348c03a797ee78b70793089b217aeb9d 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee2b1bb3ef7",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
index 89050829a4487a8cd2d01275ff41911a5c6c92ad..26148778e84252c9ffb5762a7565033cb3e5fb7d 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee2b1bb484c",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
index 05357b0ba0ab244492e5b4b6c2132d4747596557..b30bc7ae1498c4980902e5c89ddbe9f56cb750de 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
@@ -19,7 +19,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 67645734912,
+    "ram_size": 68719476736,
     "virtual_size": null
   },
   "monitoring": {
@@ -110,7 +110,7 @@
     "pstate_governor": "performance",
     "release": "Jessie",
     "turboboost_enabled": true,
-    "version": 8.6
+    "version": 8.7
   },
   "performance": {
     "core_flops": 14040000000,
@@ -137,11 +137,12 @@
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x50014ee207109227",
       "device": "sda",
       "driver": "ahci",
       "interface": "SATA",
       "model": "WDC WD2003FYYS-1",
-      "rev": 1.01,
+      "rev": "01.01D05",
       "size": 2000398934016,
       "storage": "HDD",
       "vendor": "Western Digital"
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome.yaml b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
index 8ce3f12010630d31ae844ef66674549939023c7a..86d079aa0eadad09d8297c0f0f08e4d3001076d1 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
@@ -43,12 +43,14 @@ nodes:
       eth0:
         enabled: true
         mountable: true
+        mounted: true
         bridged: true
         vendor: Intel
         version: 82599EB 10-Gigabit SFI/SFP+ Network Connection
       eth1:
         enabled: false
         mountable: false
+        mounted: false
         rate: 10.0e+9
         bridged: false
         vendor: Intel
@@ -57,6 +59,7 @@ nodes:
         rate: 1.0e+9
         enabled: false
         mountable: false
+        mounted: false
         bridged: false
         vendor: Intel
         version: Intel Corporation
@@ -64,6 +67,7 @@ nodes:
         rate: 1.0e+9
         enabled: false
         mountable: false
+        mounted: false
         bridged: false
         vendor: Intel
         version: Intel Corporation
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
index 70018e7f4805ebe4862c279b0c49954783ca350e..3697ed00ca8e75608a9f5978ef4eb702a9886836 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -15,7 +15,7 @@ econome-1:
     name: PowerEdge C6220
     serial: CP2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.1
@@ -23,38 +23,26 @@ econome-1:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.1
       mac: a0:36:9f:0e:a1:f4
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:a1:f6
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:15:4c
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:15:4d
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-1:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-1:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb39c5"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
index a7c528d2d2d90214ffa8d71ab56b97ae78557e60..dd5596a6cdf5f0ad55d3672e331ee875a343a7e6 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -15,7 +15,7 @@ econome-10:
     name: PowerEdge C6220
     serial: G9GYG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.10
@@ -27,26 +27,22 @@ econome-10:
       ip: 172.16.192.10
       mac: a0:36:9f:0e:24:80
       management: false
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
       interface: Ethernet
       mac: a0:36:9f:0e:24:82
       management: false
-      mounted: false
     eth2:
       driver: igb
       interface: Ethernet
       mac: 78:45:c4:f9:14:b0
       management: false
-      mounted: false
     eth3:
       driver: igb
       interface: Ethernet
       mac: 78:45:c4:f9:14:b1
       management: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -57,7 +53,7 @@ econome-10:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -72,8 +68,9 @@ econome-10:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee207107ae8"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
index bd95dd53a8810e3b17ebdb64b7b7ba7a3affb32b..aa93515f5ba62b8cd5fbba8b8ac1f19ee3b5aa38 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -15,7 +15,7 @@ econome-11:
     name: PowerEdge C6220
     serial: J9GYG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.11
@@ -27,26 +27,22 @@ econome-11:
       ip: 172.16.192.11
       mac: a0:36:9f:0e:36:60
       management: false
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
       interface: Ethernet
       mac: a0:36:9f:0e:36:62
       management: false
-      mounted: false
     eth2:
       driver: igb
       interface: Ethernet
       mac: 78:45:c4:f9:15:9a
       management: false
-      mounted: false
     eth3:
       driver: igb
       interface: Ethernet
       mac: 78:45:c4:f9:15:9b
       management: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -57,7 +53,7 @@ econome-11:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -72,8 +68,9 @@ econome-11:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb4a6d"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
index f581509fc9e3cbd3adfb77a5d76efaaea155ec4e..9d63c88cfe767256b9709cedf523aaba794a88f7 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -15,7 +15,7 @@ econome-12:
     name: PowerEdge C6220
     serial: H9GYG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.12
@@ -23,38 +23,26 @@ econome-12:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.12
       mac: a0:36:9f:0e:26:e4
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:26:e6
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:15:a3
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:15:a4
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-12:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-12:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee25c65a85b"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
index cb413ee0fd547126a071c6427379223c46b994af..11dbab7280dabad46ef77ac0e52d52138ca94e1b 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -15,7 +15,7 @@ econome-13:
     name: PowerEdge C6220
     serial: HN2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.13
@@ -23,38 +23,26 @@ econome-13:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.13
       mac: a0:36:9f:0e:23:d4
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:23:d6
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2c:5a
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2c:5b
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-13:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-13:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee2b1ba5d63"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
index 769d0af770cd345437d891a1a11d36784ee1fc23..0daac164ce56a95814983957a134aa0125f91693 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -15,7 +15,7 @@ econome-14:
     name: PowerEdge C6220
     serial: JN2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.14
@@ -23,38 +23,26 @@ econome-14:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.14
       mac: a0:36:9f:0e:a2:b8
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:a2:ba
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2c:6f
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2c:70
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-14:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-14:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee207106c19"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
index f9bfa242080fac8cfb5211163d440ac8d5dffffa..9eecce1a5717d8792603b68ca2dc9a448faa574f 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -15,7 +15,7 @@ econome-15:
     name: PowerEdge C6220
     serial: 1P2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.15
@@ -23,38 +23,26 @@ econome-15:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.15
       mac: a0:36:9f:01:fd:70
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:01:fd:72
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:fa:dd:9c
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:fa:dd:9d
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-15:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-15:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee25c659979"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
index a29f834e3ba992a2628ade85cad689d4eb50ea27..027471c4999ecda1a8357b1e62d37112ecf7564e 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -15,7 +15,7 @@ econome-16:
     name: PowerEdge C6220
     serial: 2P2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.16
@@ -23,38 +23,26 @@ econome-16:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.16
       mac: a0:36:9f:0e:a7:dc
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:a7:de
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2d:b0
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2d:b1
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-16:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-16:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee25c64d23d"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
index 0965701d077406e29b4e410b11b850c2ae3601ee..b8e0eb501e0bd303baf756fa8ed792c4f8efa7f8 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -15,7 +15,7 @@ econome-17:
     name: PowerEdge C6220
     serial: 1Q2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.17
@@ -23,38 +23,26 @@ econome-17:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.17
       mac: a0:36:9f:0e:a2:64
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:a2:66
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2c:33
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2c:34
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-17:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-17:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee25c6594dc"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
index b40ca48f234ab810535562b19163a2a1c28ca7da..53862cc7adea3dc50e7ebc3833c9ff27d3b212d1 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -15,7 +15,7 @@ econome-18:
     name: PowerEdge C6220
     serial: 2Q2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.18
@@ -23,38 +23,26 @@ econome-18:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.18
       mac: a0:36:9f:0e:36:a0
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:36:a2
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2d:71
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2d:72
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-18:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-18:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee2b1ba84f1"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
index a02fcbb5a65002075eb3dac3b90021bb01363c87..f52ca718f85c217a94cb67c906fe1c57c3f575fb 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -15,7 +15,7 @@ econome-19:
     name: PowerEdge C6220
     serial: JN30D5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.19
@@ -23,38 +23,26 @@ econome-19:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.19
       mac: 90:e2:ba:1a:6a:e0
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: 90:e2:ba:1a:6a:e1
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 84:8f:69:fd:46:f1
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 84:8f:69:fd:46:f2
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-19:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-19:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee25c655ff4"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D02
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
index 0c9e2e085a391ca080bd09d15d25c4e0bbd28748..7a39fe9efdd26cb90c2207c9597b0e03deb1c0e3 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -15,7 +15,7 @@ econome-2:
     name: PowerEdge C6220
     serial: DP2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.2
@@ -23,38 +23,26 @@ econome-2:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.2
       mac: a0:36:9f:0e:36:38
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:36:3a
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:15:88
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:15:89
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-2:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-2:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb4095"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
index c7792253e2d6ff651aa510efb022820097ea16d2..f61f58c63a50f8ff799c68785a3d17fa079721a8 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -15,7 +15,7 @@ econome-20:
     name: PowerEdge C6220
     serial: HN30D5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.20
@@ -27,26 +27,22 @@ econome-20:
       ip: 172.16.192.20
       mac: 90:e2:ba:1a:6b:3c
       management: false
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
       interface: Ethernet
       mac: 90:e2:ba:1a:6b:3d
       management: false
-      mounted: false
     eth2:
       driver: igb
       interface: Ethernet
       mac: 84:8f:69:fd:47:09
       management: false
-      mounted: false
     eth3:
       driver: igb
       interface: Ethernet
       mac: 84:8f:69:fd:47:0a
       management: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -57,7 +53,7 @@ econome-20:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -72,8 +68,9 @@ econome-20:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee25c658eea"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D02
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
index 824fc97e41516ecf3f950ac2549b0272276c5302..8169abf536686a70f2a4bf15fec44d2679016ecf 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -15,7 +15,7 @@ econome-21:
     name: PowerEdge C6220
     serial: 2P30D5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.21
@@ -27,26 +27,22 @@ econome-21:
       ip: 172.16.192.21
       mac: 90:e2:ba:1a:69:98
       management: false
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
       interface: Ethernet
       mac: 90:e2:ba:1a:69:99
       management: false
-      mounted: false
     eth2:
       driver: igb
       interface: Ethernet
       mac: 18:03:73:ff:be:70
       management: false
-      mounted: false
     eth3:
       driver: igb
       interface: Ethernet
       mac: 18:03:73:ff:be:71
       management: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -57,7 +53,7 @@ econome-21:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -72,8 +68,9 @@ econome-21:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee207106833"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D02
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
index b1b8425d28ae7f16a559ea461c7ca33ad5c7e519..35db22437542f1632a33b7cd04ba3c8c61d5f79a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -15,7 +15,7 @@ econome-22:
     name: PowerEdge C6220
     serial: 1P30D5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.22
@@ -27,26 +27,22 @@ econome-22:
       ip: 172.16.192.22
       mac: 90:e2:ba:1a:69:c0
       management: false
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
       interface: Ethernet
       mac: 90:e2:ba:1a:69:c1
       management: false
-      mounted: false
     eth2:
       driver: igb
       interface: Ethernet
       mac: 84:8f:69:fd:4f:e2
       management: false
-      mounted: false
     eth3:
       driver: igb
       interface: Ethernet
       mac: 84:8f:69:fd:4f:e3
       management: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -57,7 +53,7 @@ econome-22:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -72,8 +68,9 @@ econome-22:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee2071063ca"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D02
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
index b5cc93ef7c6617710a8e3381c4ab3a33ab254034..8ed86341262639f93598e08c058828532c7621f4 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -15,7 +15,7 @@ econome-3:
     name: PowerEdge C6220
     serial: FP2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.3
@@ -23,38 +23,26 @@ econome-3:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.3
       mac: a0:36:9f:0e:35:b0
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:35:b2
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2c:99
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2c:9a
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-3:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-3:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee25c659502"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
index 24a7bcd54c5da64f02753603d8f4975956147139..03eb39b17a27af2b17a57b42cb2e2e40ec74ac71 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -15,7 +15,7 @@ econome-4:
     name: PowerEdge C6220
     serial: GP2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.4
@@ -23,38 +23,26 @@ econome-4:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.4
       mac: a0:36:9f:0e:35:a0
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:35:a2
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2c:c0
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:2c:c1
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-4:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-4:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee25c65918c"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
index 5f314fc2dce2ac47ad69babcb64447623e552cad..1e2304f002d8934880c6c9ca8ec185100e9ee4d5 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -15,7 +15,7 @@ econome-5:
     name: PowerEdge C6220
     serial: CQ2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.5
@@ -23,38 +23,26 @@ econome-5:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.5
       mac: a0:36:9f:0e:2e:c4
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:2e:c6
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:16:ca
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:16:cb
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-5:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-5:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee25c658e9c"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
index 10a62735c5ceec7afae5dfd04fc23053f85c3c83..72be5955853d1280f1dbdbe8fad9a92a53dbaed7 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -15,7 +15,7 @@ econome-6:
     name: PowerEdge C6220
     serial: DQ2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.6
@@ -23,38 +23,26 @@ econome-6:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.6
       mac: a0:36:9f:0e:a4:90
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:a4:92
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:14:35
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:14:36
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-6:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-6:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee207107f8d"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
index b0e624af76acc497311a388d340f8d4a53c3c0f6..327eb504fea28bd98acb45c062e3b620a7327623 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -15,7 +15,7 @@ econome-7:
     name: PowerEdge C6220
     serial: FQ2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.7
@@ -23,38 +23,26 @@ econome-7:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.7
       mac: a0:36:9f:0e:24:a8
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:24:aa
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:16:c4
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:16:c5
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-7:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-7:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb3ef7"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
index 624fb658a88326628637400de2e66006974c0770..1033a9720e0c63e5bffd5daaed326d7cc0fd9708 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -15,7 +15,7 @@ econome-8:
     name: PowerEdge C6220
     serial: GQ2YG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.8
@@ -23,38 +23,26 @@ econome-8:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.8
       mac: a0:36:9f:0e:24:8c
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:24:8e
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:16:be
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:16:bf
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-8:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-8:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb484c"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types:
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
index ffa91eb46887be1a3cbb997b7185273f1b091c0d..62e6df6b4a389ffa63e7d5fc9385d2402cf223e7 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -15,7 +15,7 @@ econome-9:
     name: PowerEdge C6220
     serial: F9GYG5J
   main_memory:
-    ram_size: 67645734912
+    ram_size: 68719476736
   network_adapters:
     bmc:
       ip: 172.17.192.9
@@ -23,38 +23,26 @@ econome-9:
       management: true
     eth0:
       driver: ixgbe
-      enabled: true
       interface: Ethernet
       ip: 172.16.192.9
       mac: a0:36:9f:0e:36:34
       management: false
-      mountable: true
-      mounted: true
       rate: 10000000000
     eth1:
       driver: ixgbe
-      enabled: false
       interface: Ethernet
       mac: a0:36:9f:0e:36:36
       management: false
-      mountable: false
-      mounted: false
     eth2:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:15:ca
       management: false
-      mountable: false
-      mounted: false
     eth3:
       driver: igb
-      enabled: false
       interface: Ethernet
       mac: 78:45:c4:f9:15:cb
       management: false
-      mountable: false
-      mounted: false
   operating_system:
     cstate_driver: intel_idle
     cstate_governor: menu
@@ -65,7 +53,7 @@ econome-9:
     pstate_driver: intel_pstate
     pstate_governor: performance
     turboboost_enabled: true
-    version: 8.6
+    version: 8.7
   processor:
     cache_l1d: 32768
     cache_l1i: 32768
@@ -80,8 +68,9 @@ econome-9:
     version: E5-2660
   storage_devices:
     sda:
+      by_id: "/dev/disk/by-id/wwn-0x50014ee207109227"
       model: WDC WD2003FYYS-1
-      rev: 1.01
+      rev: 01.01D05
       size: 2000398934016
       vendor: Western Digital
   supported_job_types: