diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
index 4232e59b70c173e6909f4d632c77da571687720e..a3621d70232b7b0167d53d0be77f98c21f58ac89 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
@@ -125,6 +125,7 @@
       "ib_switch_card_pos": null,
       "interface": "InfiniBand",
       "ip": "172.18.72.50",
+      "ip6": "fe80::e61d:2d03:bf:5071",
       "management": false,
       "model": "MT27500 Family [ConnectX-3]",
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
index c57ecc8cee5c39e5fd09bc27fb3663ad5f927db7..c7fc48314f59abbc9d24822e2d5cbdfcb78d18f5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
@@ -125,6 +125,7 @@
       "ib_switch_card_pos": null,
       "interface": "InfiniBand",
       "ip": "172.18.72.51",
+      "ip6": "fe80::e61d:2d03:bf:4f81",
       "management": false,
       "model": "MT27500 Family [ConnectX-3]",
       "mountable": true,
diff --git a/dev/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml b/dev/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
index cf8790be7231453c8eea013775ecdc073a39b7fb..06cc6a9b2398f8c38359e8b2b524e243220ef596 100644
--- a/dev/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
@@ -1,92 +1,77 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-50:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3F1ZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1278
-      timewrite: 2879
-    sdb:
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3F1ZH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:a4
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:a5
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.50
-      driver: ixgbe
       mac: 24:6e:96:03:0b:a0
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0b:a2
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:24
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:26
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0b:a4
       management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0b:a5
+      management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
-      ip: 172.18.72.50
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:71
+      interface: InfiniBand
+      ip: 172.18.72.50
+      ip6: fe80::e61d:2d03:bf:5071
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      mounted: true
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/dev/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml b/dev/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
index 6bcb1a23b7b3163f9d1bb92120b64cf7a64068bc..58870d6675e8b6e66668185ace4752e16f1b8086 100644
--- a/dev/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ b/dev/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
@@ -1,94 +1,77 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-51:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2S11J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1281
-      timewrite: 2952
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2S11J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:24
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.51
-      driver: ixgbe
       mac: 24:6e:96:03:24:20
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:25
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:24:22
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:e8
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:ea
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:24:24
       management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:24:25
+      management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
-      ip: 172.18.72.51
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:81
+      interface: InfiniBand
+      ip: 172.18.72.51
+      ip6: fe80::e61d:2d03:bf:4f81
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      mounted: true
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt