diff --git a/dev/input/grid5000/sites/grenoble/clusters/edel/edel.yaml b/dev/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
index af1a4bfcfa2eb3378eaa3533e9ceea94219f39d8..1fd4ed6e80e36ffabf10460e8eb33f38f83d781a 100644
--- a/dev/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
+++ b/dev/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
@@ -79,9 +79,7 @@ nodes:
         management: false
         mountable: false
         mounted: false
-        rate: 10000000000
         version: MT26428
-        rate: 40.0e+9
         vendor: Mellanox
       bmc:
         interface: Ethernet
@@ -166,8 +164,6 @@ nodes:
         management: false
         mountable: false
         mounted: false
-        rate: 10000000000
-        version: MT26428
   edel-17:
     chassis:
       serial: '123456789'
@@ -213,8 +209,6 @@ nodes:
         management: false
         mountable: false
         mounted: false
-        rate: 10000000000
-        version: MT26428
   edel-20:
     chassis:
       serial: '123456789'
@@ -376,8 +370,6 @@ nodes:
         management: false
         mountable: false
         mounted: false
-        rate: 10000000000
-        version: MT26428
   edel-38:
     chassis:
       serial: '123456789'
@@ -422,8 +414,6 @@ nodes:
         management: false
         mountable: false
         mounted: false
-        rate: 10000000000
-        version: MT26428
   edel-42:
     chassis:
       serial: '123456789'
@@ -441,8 +431,6 @@ nodes:
         management: false
         mountable: false
         mounted: false
-        rate: 10000000000
-        version: MT26428
   edel-43:
     chassis:
       serial: '123456789'
@@ -529,8 +517,6 @@ nodes:
         management: false
         mountable: false
         mounted: false
-        rate: 10000000000
-        version: MT26428
   edel-50:
     chassis:
       serial: '123456789'
@@ -631,8 +617,6 @@ nodes:
         management: false
         mountable: false
         mounted: false
-        rate: 10000000000
-        version: MT26428
   edel-60:
     chassis:
       serial: '123456789'
diff --git a/dev/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml b/dev/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
index 6871c35288fe27df8e2fd83ae3c637624b8dd63b..a6cb647c39521d9f28aae936da56bd964c7013ae 100644
--- a/dev/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
+++ b/dev/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
@@ -33,20 +33,26 @@ nodes:
         storage: HDD
     network_adapters:
       eth0:
-        rate: 1.0e+9
+        enabled: false
+        mountable: false
+        #rate: 1.0e+9
         bridged: false
         vendor: Intel
         version: Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)
       eth1:
-        rate: 1.0e+9
+        enabled: true
+        mountable: true
+        #rate: 1.0e+9
         bridged: true
         vendor: Intel
         version: Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)
       ib0:
         vendor: Mellanox
       ib1:
-       rate: 40.0e+9
-       vendor: Mellanox
+        enabled: false
+        mountable: false
+        #rate: 40.0e+9
+        vendor: Mellanox
       bmc:
         interface: Ethernet
         rate: 1.0e+9
diff --git a/dev/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml b/dev/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
index d6491a7d48e8485677c915bb4c9c8be695d2d66a..b1d52ba2fab141ce96c3411dcc8e08c17a5be348 100644
--- a/dev/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
+++ b/dev/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
@@ -13,7 +13,6 @@ chirloute-2:
       model: ST3300657SS
       size: 300000000000
       rev: ES64
-      vendor: SEAGATEi
   network_adapters:
     eth0:
       mounted: false
diff --git a/dev/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml b/dev/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
index f4e327edac1b1404ed8272070080be1b747b5683..fc0e5a5701dcc004f333654ec35a592508c73866 100644
--- a/dev/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
+++ b/dev/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
@@ -42,7 +42,6 @@ nodes:
         interface: SAS
         driver: mptsas
         storage: HDD
-        vendor: SEAGATE
     network_adapters:
       eth0:
         enabled: true
@@ -78,7 +77,6 @@ nodes:
       kavlan: 10.40.0.0/14
       virt: 10.172.0.0/14
 
-
   granduc-1:
     chassis:
       serial: 2QV963J
@@ -163,9 +161,6 @@ nodes:
       eth2:
         ip: 172.16.179.15
         ip6: fe80::21b:21ff:fe34:e0f1
-    storage_devices:
-      sda:
-        vendor: FUJITSU
   granduc-16:
     chassis:
       serial: JZV883J
@@ -208,9 +203,6 @@ nodes:
       eth2:
         ip: 172.16.179.18
         ip6: fe80::21b:21ff:fe34:e107
-    storage_devices:
-      sda:
-        vendor: FUJITSU
   granduc-19:
     chassis:
       serial: 69N983J
@@ -267,9 +259,6 @@ nodes:
       eth2:
         ip: 172.16.179.21
         ip6: fe80::21b:21ff:fe3d:137d
-    storage_devices:
-      sda:
-        vendor: FUJITSU
   granduc-22:
     chassis:
       serial: HQ2593J
@@ -284,9 +273,6 @@ nodes:
       eth2:
         ip: 172.16.179.22
         ip6: fe80::21b:21ff:fe34:e0e7
-    storage_devices:
-      sda:
-        vendor: FUJITSU
   granduc-4:
     chassis:
       serial: FQ2593J
@@ -301,9 +287,6 @@ nodes:
       eth2:
         ip: 172.16.179.4
         ip6: fe80::21b:21ff:fe3d:12e9
-    storage_devices:
-      sda:
-        vendor: FUJITSU
   granduc-5:
     chassis:
       serial: 99N983J
@@ -332,9 +315,6 @@ nodes:
       eth2:
         ip: 172.16.179.6
         ip6: fe80::21b:21ff:fe3d:13ab
-    storage_devices:
-      sda:
-        vendor: FUJITSU
   granduc-7:
     chassis:
       serial: 49N983J
diff --git a/dev/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml b/dev/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
index 972feeffae31cc16276377630057f07c6cca2c54..20ac7bd4b38d1166d9f7ddec5848d249233b925f 100644
--- a/dev/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
+++ b/dev/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
@@ -32,7 +32,6 @@ petitprince-8:
       mac: 90:b1:1c:ac:d3:1b
   storage_devices:
     sda:
-      vendor: SEAGATE
       model: ST9250610NS
       rev: AA08
       size: 250059350016
diff --git a/dev/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/dev/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
index 7530260385d6c663d8ca094672ba77d13456dbda..95bc38c57cd8960c103ce852ebacd4708e93a1b9 100644
--- a/dev/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
+++ b/dev/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
@@ -26,7 +26,6 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
-      virtual: ivt
       max_walltime: 0
       queues:
         - default
diff --git a/dev/input/grid5000/sites/nancy/clusters/graoully/graoully_ip.yaml.erb b/dev/input/grid5000/sites/nancy/clusters/graoully/graoully_ip.yaml.erb
index c949de097e566da037fa7f2bee1a432dce8a5b0d..c3f48d83bacf7cf45cf44863ff40e38f7fb10d89 100644
--- a/dev/input/grid5000/sites/nancy/clusters/graoully/graoully_ip.yaml.erb
+++ b/dev/input/grid5000/sites/nancy/clusters/graoully/graoully_ip.yaml.erb
@@ -6,44 +6,44 @@ nodes:
         mounted: true
         ip: 172.16.70.<%= i %>
         mac: <%= %w(
-                    24:6E:96:03:0D:08
-                    24:6E:96:03:0A:28
-                    24:6E:96:03:11:08
-                    24:6E:96:03:0E:58
-                    24:6E:96:03:1F:90
-                    24:6E:96:03:0C:20
-                    24:6E:96:03:1E:08
-                    24:6E:96:03:12:70
-                    24:6E:96:03:1E:D0
-                    24:6E:96:03:0D:F8
-                    24:6E:96:03:1F:98
-                    24:6E:96:03:09:98
-                    24:6E:96:03:24:08
-                    24:6E:96:03:12:D8
-                    24:6E:96:03:09:F8
-                    24:6E:96:03:0F:50
+                    24:6e:96:03:0d:08
+                    24:6e:96:03:0a:28
+                    24:6e:96:03:11:08
+                    24:6e:96:03:0e:58
+                    24:6e:96:03:1f:90
+                    24:6e:96:03:0c:20
+                    24:6e:96:03:1e:08
+                    24:6e:96:03:12:70
+                    24:6e:96:03:1e:d0
+                    24:6e:96:03:0d:f8
+                    24:6e:96:03:1f:98
+                    24:6e:96:03:09:98
+                    24:6e:96:03:24:08
+                    24:6e:96:03:12:d8
+                    24:6e:96:03:09:f8
+                    24:6e:96:03:0f:50
                    )[i-1] %>
       ib0:
         ip: 172.18.70.<%= i %>
       bmc:
         ip: 172.17.70.<%= i %>
         mac: <%= %w(
-                   64:00:6A:C1:57:D2
-                   64:00:6A:C1:56:A8
-                   64:00:6A:C1:56:7E
-                   64:00:6A:C1:56:C6
-                   64:00:6A:C0:DD:5E
-                   64:00:6A:C0:F1:F4
-                   64:00:6A:C0:F2:5E
-                   64:00:6A:C0:DC:F4
-                   64:00:6A:C0:F2:A6
-                   64:00:6A:C0:F1:E4
-                   64:00:6A:C0:F2:2E
-                   64:00:6A:C0:DC:36
-                   64:00:6A:C0:DC:A4
-                   64:00:6A:C1:56:C8
-                   64:00:6A:C1:56:EE
-                   64:00:6A:C1:55:FE
+                   64:00:6a:c1:57:d2
+                   64:00:6a:c1:56:a8
+                   64:00:6a:c1:56:7e
+                   64:00:6a:c1:56:c6
+                   64:00:6a:c0:dd:5e
+                   64:00:6a:c0:f1:f4
+                   64:00:6a:c0:f2:5e
+                   64:00:6a:c0:dc:f4
+                   64:00:6a:c0:f2:a6
+                   64:00:6a:c0:f1:e4
+                   64:00:6a:c0:f2:2e
+                   64:00:6a:c0:dc:36
+                   64:00:6a:c0:dc:a4
+                   64:00:6a:c1:56:c8
+                   64:00:6a:c1:56:ee
+                   64:00:6a:c1:55:fe
                   )[i-1] %>
 
 <% i149_165 = i+148 %>
diff --git a/dev/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml b/dev/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
index 0221b484ba93b63f4bb3e2e235ed00bb95037360..ca943dc0450e5d4a1292467d3dba54e87d53b171 100644
--- a/dev/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
@@ -98,7 +98,6 @@ nodes:
     supported_job_types:
       max_walltime: 31536000
 
-
   graphique-1:
     chassis:
       serial: BYGMJ32
@@ -106,6 +105,7 @@ nodes:
       bmc:
         ip: 172.17.67.1
         mac: b0:83:fe:e4:69:d8
+
   graphique-5:
     chassis:
       serial: BXTRV42
@@ -113,5 +113,3 @@ nodes:
       bmc:
         ip: 172.17.67.5
         mac: 18:fb:7b:9b:91:d3
-      eth2:
-        enabled: true
diff --git a/dev/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml b/dev/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
index 40e3a3394ac0bac7c7e6d4f913c2a8370a81d4d5..25bd83ca115ea2bb7a259b5473c572115ebcb384 100644
--- a/dev/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
@@ -9,7 +9,6 @@ graphique-2:
       interface: Ethernet
       driver: bnx2x
       mac: 44:a8:42:07:6a:c8
-      rate: 10000000000
       mounted: false
       mountable: false
       management: false
@@ -18,7 +17,6 @@ graphique-2:
       interface: Ethernet
       driver: bnx2x
       mac: 44:a8:42:07:6a:ca
-      rate: 10000000000
       mounted: false
       mountable: false
       management: false
@@ -28,7 +26,6 @@ graphique-2:
       ip: 172.16.67.2
       driver: bnx2x
       mac: 44:a8:42:07:6a:cc
-      rate: 1000000000
       mounted: true
       mountable: true
       management: false
diff --git a/dev/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml b/dev/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
index b412c7a0988db843a4a46b12b28581a48e53fa42..121eb95e3307a40fe1054b0da488e3ba57622f96 100644
--- a/dev/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/griffon/griffon.yaml
@@ -25,6 +25,18 @@ nodes:
         version: Myri-10G
         vendor: myrinet
 
+  griffon-[1-10]:
+   network_adapters:
+      eth1:
+        enabled: false
+        mountable: false
+
+  griffon-[15-]:
+   network_adapters:
+      eth1:
+        enabled: false
+        mountable: false
+
 # Global node properties
   griffon-[-]:
     performance:
@@ -72,8 +84,6 @@ nodes:
         vendor: intel
         version: 80003ES2LAN
       eth1:
-        enabled: false
-        mountable: false
         bridged: false
         rate: 1000000000 #1G
         vendor: intel
diff --git a/dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml.erb b/dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml.erb
index 447815c79225fff9d240e95e869119c9eca10ce8..7171ae4da0f27168a5040a14e3ba9796453bcb1b 100644
--- a/dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml.erb
+++ b/dev/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml.erb
@@ -6,14 +6,14 @@ nodes:
         mounted: true
         ip: 172.16.71.<%= i %>
         mac: <%= %w(
-                    24:6E:96:03:0C:C8
-                    24:6E:96:03:24:78
-                    24:6E:96:03:20:F0
-                    24:6E:96:02:A7:C8
-                    24:6E:96:02:96:90
-                    24:6E:96:02:A3:88
-                    24:6E:96:02:A9:78
-                    24:6E:96:02:A0:88
+                    24:6e:96:03:0c:c8
+                    24:6e:96:03:24:78
+                    24:6e:96:03:20:f0
+                    24:6e:96:02:a7:c8
+                    24:6e:96:02:96:90
+                    24:6e:96:02:a3:88
+                    24:6e:96:02:a9:78
+                    24:6e:96:02:a0:88
                    )[i-1] %>
       eth1:
 <% i11_18 = i + 10 %>
@@ -29,14 +29,14 @@ nodes:
       bmc:
         ip: 172.17.71.<%= i %>
         mac: <%= %w(
-                   64:00:6A:C0:F1:EA
-                   64:00:6A:C0:F3:0E
-                   64:00:6A:C0:F2:18
-                   64:00:6A:C0:F0:BA
-                   64:00:6A:C0:F1:78
-                   64:00:6A:C0:F1:74
-                   64:00:6A:C0:F1:54
-                   64:00:6A:C0:F1:24
+                   64:00:6a:c0:f1:ea
+                   64:00:6a:c0:f3:0e
+                   64:00:6a:c0:f2:18
+                   64:00:6a:c0:f0:ba
+                   64:00:6a:c0:f1:78
+                   64:00:6a:c0:f1:74
+                   64:00:6a:c0:f1:54
+                   64:00:6a:c0:f1:24
                   )[i-1] %>
 
 <% i166_174 = i + 165 %>
diff --git a/dev/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml b/dev/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
index 81e2bf2511174c74cfeb6aecc99b965bf7bd120e..7e2fad540ddb84ed96d5c3ff96d04e076a58534c 100644
--- a/dev/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
@@ -207,7 +207,6 @@ nodes:
       bmc:
         enabled: true
         interface: Ethernet
-        ip: 172.17.72.50
         management: true
         mountable: false
         mounted: false
diff --git a/dev/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml.erb b/dev/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml.erb
index 86cf6ef41b147f87c20626a823d96ca79c7c56eb..b66889ba30c5f118f074dc0024ba17194d1b7952 100644
--- a/dev/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml.erb
+++ b/dev/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml.erb
@@ -6,57 +6,57 @@ nodes:
         mounted: true
         ip: 172.16.72.<%= i %>
         mac: <%= %w(
-                    24:6E:96:03:0C:60
-                    24:6E:96:03:0C:98
-                    24:6E:96:03:0B:F8
-                    24:6E:96:03:0D:40
-                    24:6E:96:02:A0:A8
-                    24:6E:96:03:0A:30
-                    24:6E:96:03:10:58
-                    24:6E:96:03:11:B8
-                    24:6E:96:02:97:A8
-                    24:6E:96:03:0A:38
-                    24:6E:96:03:0E:B8
-                    24:6E:96:03:0F:C8
-                    24:6E:96:03:11:90
-                    24:6E:96:02:A3:E0
-                    24:6E:96:02:9F:08
-                    24:6E:96:03:0F:88
-                    24:6E:96:02:A1:50
-                    24:6E:96:03:0E:90
-                    24:6E:96:03:0F:A0
-                    24:6E:96:03:09:D8
-                    24:6E:96:03:0A:10
-                    24:6E:96:03:0A:68
-                    24:6E:96:02:A1:38
-                    24:6E:96:02:A9:80
-                    24:6E:96:02:A7:D0
-                    24:6E:96:02:A1:98
-                    24:6E:96:02:A4:70
-                    24:6E:96:02:A3:C0
-                    24:6E:96:02:A9:88
-                    24:6E:96:02:A4:30
-                    24:6E:96:03:10:F8
-                    24:6E:96:03:11:D0
-                    24:6E:96:03:09:B0
-                    24:6E:96:03:1F:C8
-                    24:6E:96:03:11:60
-                    24:6E:96:03:11:70
-                    24:6E:96:03:23:28
-                    24:6E:96:03:0C:00
-                    24:6E:96:03:09:C0
-                    24:6E:96:03:21:58
-                    24:6E:96:03:11:F8
-                    24:6E:96:03:0B:B8
-                    24:6E:96:03:09:E0
-                    24:6E:96:03:0C:10
-                    24:6E:96:03:0D:68
-                    24:6E:96:03:10:18
-                    24:6E:96:03:0A:40
-                    24:6E:96:03:0D:50
-                    24:6E:96:03:0E:80
-                    24:6E:96:03:0B:A0
-                    24:6E:96:03:24:20
+                    24:6e:96:03:0c:60
+                    24:6e:96:03:0c:98
+                    24:6e:96:03:0b:f8
+                    24:6e:96:03:0d:40
+                    24:6e:96:02:a0:a8
+                    24:6e:96:03:0a:30
+                    24:6e:96:03:10:58
+                    24:6e:96:03:11:b8
+                    24:6e:96:02:97:a8
+                    24:6e:96:03:0a:38
+                    24:6e:96:03:0e:b8
+                    24:6e:96:03:0f:c8
+                    24:6e:96:03:11:90
+                    24:6e:96:02:a3:e0
+                    24:6e:96:02:9f:08
+                    24:6e:96:03:0f:88
+                    24:6e:96:02:a1:50
+                    24:6e:96:03:0e:90
+                    24:6e:96:03:0f:a0
+                    24:6e:96:03:09:d8
+                    24:6e:96:03:0a:10
+                    24:6e:96:03:0a:68
+                    24:6e:96:02:a1:38
+                    24:6e:96:02:a9:80
+                    24:6e:96:02:a7:d0
+                    24:6e:96:02:a1:98
+                    24:6e:96:02:a4:70
+                    24:6e:96:02:a3:c0
+                    24:6e:96:02:a9:88
+                    24:6e:96:02:a4:30
+                    24:6e:96:03:10:f8
+                    24:6e:96:03:11:d0
+                    24:6e:96:03:09:b0
+                    24:6e:96:03:1f:c8
+                    24:6e:96:03:11:60
+                    24:6e:96:03:11:70
+                    24:6e:96:03:23:28
+                    24:6e:96:03:0c:00
+                    24:6e:96:03:09:c0
+                    24:6e:96:03:21:58
+                    24:6e:96:03:11:f8
+                    24:6e:96:03:0b:b8
+                    24:6e:96:03:09:e0
+                    24:6e:96:03:0c:10
+                    24:6e:96:03:0d:68
+                    24:6e:96:03:10:18
+                    24:6e:96:03:0a:40
+                    24:6e:96:03:0d:50
+                    24:6e:96:03:0e:80
+                    24:6e:96:03:0b:a0
+                    24:6e:96:03:24:20
                    )[i-1] %>
 <% if i < 50 %>
       eth1:
@@ -75,57 +75,57 @@ nodes:
       bmc:
         ip: 172.17.72.<%= i %>
         mac: <%= %w(
-                    64:00:6A:C0:F3:56
-                    64:00:6A:C0:DD:0A
-                    64:00:6A:C0:DD:8A
-                    64:00:6A:C0:DB:EE
-                    64:00:6A:C0:E4:0E
-                    64:00:6A:C0:E4:72
-                    64:00:6A:C0:DD:12
-                    64:00:6A:C0:DC:46
-                    64:00:6A:C0:E4:04
-                    64:00:6A:C0:E3:EE
-                    64:00:6A:C0:DB:D4
-                    64:00:6A:C0:DD:78
-                    64:00:6A:C0:DB:80
-                    64:00:6A:C0:DD:70
-                    64:00:6A:C0:DD:2C
-                    64:00:6A:C0:E4:1E
-                    64:00:6A:C0:E4:34
-                    64:00:6A:C0:DC:A6
-                    64:00:6A:C0:DC:12
-                    64:00:6A:C0:E4:4C
-                    64:00:6A:C0:DE:38
-                    64:00:6A:C0:E5:1E
-                    64:00:6A:C0:F3:52
-                    64:00:6A:C0:DC:E8
-                    64:00:6A:C0:F2:88
-                    64:00:6A:C0:E5:46
-                    64:00:6A:C0:DC:EC
-                    64:00:6A:C0:DD:C8
-                    64:00:6A:C0:F3:06
-                    64:00:6A:C0:DC:60
-                    64:00:6A:C0:C7:48
-                    64:00:6A:C0:EA:52
-                    64:00:6A:C0:E3:E6
-                    64:00:6A:C0:EA:98
-                    64:00:6A:C0:EB:B8
-                    64:00:6A:C0:E4:78
-                    64:00:6A:C0:E4:74
-                    64:00:6A:C0:E4:3A
-                    64:00:6A:C0:E4:18
-                    64:00:6A:C0:E3:FE
-                    64:00:6A:C0:DC:6A
-                    64:00:6A:C0:E4:0A
-                    64:00:6A:C0:E3:EA
-                    64:00:6A:C0:DD:CE
-                    64:00:6A:C0:DC:10
-                    64:00:6A:C0:DD:62
-                    64:00:6A:C0:E4:E4
-                    64:00:6A:C0:E6:08
-                    64:00:6A:C0:DC:5C
-                    64:00:6A:C1:56:9A
-                    64:00:6A:C0:E5:BA
+                    64:00:6a:c0:f3:56
+                    64:00:6a:c0:dd:0a
+                    64:00:6a:c0:dd:8a
+                    64:00:6a:c0:db:ee
+                    64:00:6a:c0:e4:0e
+                    64:00:6a:c0:e4:72
+                    64:00:6a:c0:dd:12
+                    64:00:6a:c0:dc:46
+                    64:00:6a:c0:e4:04
+                    64:00:6a:c0:e3:ee
+                    64:00:6a:c0:db:d4
+                    64:00:6a:c0:dd:78
+                    64:00:6a:c0:db:80
+                    64:00:6a:c0:dd:70
+                    64:00:6a:c0:dd:2c
+                    64:00:6a:c0:e4:1e
+                    64:00:6a:c0:e4:34
+                    64:00:6a:c0:dc:a6
+                    64:00:6a:c0:dc:12
+                    64:00:6a:c0:e4:4c
+                    64:00:6a:c0:de:38
+                    64:00:6a:c0:e5:1e
+                    64:00:6a:c0:f3:52
+                    64:00:6a:c0:dc:e8
+                    64:00:6a:c0:f2:88
+                    64:00:6a:c0:e5:46
+                    64:00:6a:c0:dc:ec
+                    64:00:6a:c0:dd:c8
+                    64:00:6a:c0:f3:06
+                    64:00:6a:c0:dc:60
+                    64:00:6a:c0:c7:48
+                    64:00:6a:c0:ea:52
+                    64:00:6a:c0:e3:e6
+                    64:00:6a:c0:ea:98
+                    64:00:6a:c0:eb:b8
+                    64:00:6a:c0:e4:78
+                    64:00:6a:c0:e4:74
+                    64:00:6a:c0:e4:3a
+                    64:00:6a:c0:e4:18
+                    64:00:6a:c0:e3:fe
+                    64:00:6a:c0:dc:6a
+                    64:00:6a:c0:e4:0a
+                    64:00:6a:c0:e3:ea
+                    64:00:6a:c0:dd:ce
+                    64:00:6a:c0:dc:10
+                    64:00:6a:c0:dd:62
+                    64:00:6a:c0:e4:e4
+                    64:00:6a:c0:e6:08
+                    64:00:6a:c0:dc:5c
+                    64:00:6a:c1:56:9a
+                    64:00:6a:c0:e5:ba
                   )[i-1] %>
 
 <% i175_226 = i+174 %>
diff --git a/dev/input/grid5000/sites/nantes/clusters/econome/econome.yaml b/dev/input/grid5000/sites/nantes/clusters/econome/econome.yaml
index a54c3ed14c07afc7604196eb424d6c8a009009ed..bfa76621b9b5b2d5b644f8077fb4a0aee31e4422 100644
--- a/dev/input/grid5000/sites/nantes/clusters/econome/econome.yaml
+++ b/dev/input/grid5000/sites/nantes/clusters/econome/econome.yaml
@@ -41,7 +41,6 @@ nodes:
         storage: HDD
     network_adapters:
       eth0:
-        rate: 10.0e+9
         enabled: true
         mountable: true
         bridged: true
@@ -263,4 +262,4 @@ nodes:
     chassis:
       serial: 1P30D5J
   
-  
\ No newline at end of file
+  
diff --git a/dev/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml b/dev/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
index 9c538bbf17499541a44b7a0dcda084c46ecee846..a78c715240bcbbbadb716db70bce3aafa1761c35 100644
--- a/dev/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
+++ b/dev/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
@@ -59,7 +59,6 @@ nodes:
       eth0:
         enabled: true
         mountable: true
-        rate: 10.0e+9 #10G
         bridged: true
         vendor: Intel
         version: 82599EB 10-Gigabit SFI/SFP+ Network Connection
diff --git a/dev/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml b/dev/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
index 557337a9295bcbd54e83f832227adaf379f08eef..ee676f16790935115157393f533e839831e63aa7 100644
--- a/dev/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
+++ b/dev/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
@@ -91,8 +91,6 @@ nodes:
         mounted: false
         mountable: false
         management: true
-        ip: null #TODO
-        mac: null #TODO
     gpu:
       gpu: false
 
@@ -112,11 +110,7 @@ nodes:
         driver: igb
         interface: Ethernet
         mac: ec:f4:bb:d1:01:7c
-        management: false
-        mounted: false
       eth3:
         driver: igb
         interface: Ethernet
         mac: ec:f4:bb:d1:01:7d
-        management: false
-        mounted: false
diff --git a/dev/input/grid5000/sites/sophia/clusters/sol/sol.yaml b/dev/input/grid5000/sites/sophia/clusters/sol/sol.yaml
index 3b326f88681fad42bf706ed95dd5c32f39f39e36..101a86f0d7fe8a3cb851268ba220cf7c79f593bf 100644
--- a/dev/input/grid5000/sites/sophia/clusters/sol/sol.yaml
+++ b/dev/input/grid5000/sites/sophia/clusters/sol/sol.yaml
@@ -39,7 +39,6 @@ nodes:
         interface: SATA
         driver: sata_nv
         storage: HDD
-        vendor: Hitachi
     gpu:
       gpu: false
     monitoring:
@@ -99,6 +98,22 @@ nodes:
         management: false
         switch: sw-myrinet
 
+  # sda vendor
+  sol-[1-24]:
+    storage_devices:
+      sda:
+        vendor: Hitachi
+
+  sol-[26-33]:
+    storage_devices:
+      sda:
+        vendor: Hitachi
+
+  sol-[35-50]:
+    storage_devices:
+      sda:
+        vendor: Hitachi
+
 # Retired nodes
   sol-36:
     status: retired