diff --git a/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml b/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml
index 14fafc9d7e4f03c598c77d878e5009e65ee19864..3a9230099031e07fcef1ab14a6bf6fc6c6da4276 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml
@@ -28,11 +28,15 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
diff --git a/input/grid5000/sites/grenoble/clusters/edel/edel.yaml b/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
index 182e5f1103bfaf71bab918fe7568a585efed7310..85bb34e95e136ff3f91880f91454815cb9e858d6 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/edel.yaml
@@ -28,11 +28,15 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
@@ -663,9 +667,9 @@ nodes:
       eth0:
         ip6: fe80::a00:38ff:fe35:adbe
     operating_system:
-      kernel: 2.6.32-5-amd64
+      kernel: 3.16.0-4-amd64
       name: debian
-      version: 6.0.6
+      version: '8.2'
   edel-65:
     chassis:
       serial: '123456789'
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
index 77d8f48967c267861dd1586045bc0283d353096b..46c62e7ba7ad7486993528c9c59dcbf8808a99b5 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
@@ -78,6 +78,6 @@ edel-1:
     platform_type: x86_64
     smt_size: 8
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml b/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
index bc3d87b1473b747a17cedd15cd22d1aea531b3dc..d705d6dd23e41c995c0b922270bf4ca44baa0609 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/genepi.yaml
@@ -10,18 +10,22 @@ queues:
 nodes:
 
 # Global node properties
-  adonis-[1-34]:
+  genepi-[1-34]:
     performance:
       core_flops: 7651000000
       node_flops: 49650000000
     supported_job_types:
       deploy: true
       besteffort: true
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
index 9b1eea23ee749538ed71441804fe1c71d1efeacf..087c9a950f7bff97de65cb3fe9046a6040c566dc 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.yaml
@@ -11,9 +11,9 @@ genepi-1:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     ib0:
       mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
index 01e6ecc14fd3af2ef00ada01e1166c708e5865bf..81521b75afc5228111f33073a6aa1888b7a30fd9 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.yaml
@@ -57,9 +57,9 @@ genepi-10:
       mac: 00:30:48:96:d4:2d
       ip: 172.17.16.10
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
index 6ff0f55e2fbc05d6e06237ea503c5ab66d6fe825..dbd6521c8ac34e61196f49b008f75101f966df41 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.yaml
@@ -57,9 +57,9 @@ genepi-11:
       mac: 00:30:48:96:d6:90
       ip: 172.17.16.11
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
index 352ec1430b18165c0138a4c8befa7b3e36c1d637..01fd12ca995eae091d3a9e017884b547d4d88ca7 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.yaml
@@ -57,9 +57,9 @@ genepi-12:
       mac: 00:30:48:96:d2:39
       ip: 172.17.16.12
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
index dfe6e664329ceafe805cb18d9c13b49328ce3a67..aa03f63cfd908313f41ce4913c768aadb9221996 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.yaml
@@ -5,9 +5,9 @@ genepi-13:
     vendor: Phoenix Technologies LTD
     version: 1.1a
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     ib0:
       mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
index 950f1c81776902b3591b3af494e9bbb545f42b8f..bc2681437bdee722587430c78e62d577e4fb2b8d 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.yaml
@@ -11,9 +11,9 @@ genepi-14:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     ib0:
       mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
index ab1ef06b8127e59130676a11f0e80e54c2735c42..bbb406550d48af7462f0063447b7cf2d7dce84bc 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.yaml
@@ -57,9 +57,9 @@ genepi-15:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
index 9c401767c1ef4b874fc8ea18667e4f773c267b55..62be62d5ab73c83f119d9eef43e134f0f34fd3c2 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.yaml
@@ -51,9 +51,9 @@ genepi-16:
       mac: 00:30:48:96:d4:37
       ip: 172.17.16.16
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: WDC WD1600YS-01S
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
index b1771c40780cb992ed5d9ccae8cf4ab1e9d63c51..194f8f7863490114e1459a3bdb433a37a9c5b4ee 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.yaml
@@ -5,9 +5,9 @@ genepi-17:
     vendor: Phoenix Technologies LTD
     version: 1.1a
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     ib0:
       mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
index 78ba3e111c3546e586f9ef26fa315b4fa73edf42..0144c8e316b2071f21ab36e62a7829ab856ec502 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.yaml
@@ -57,9 +57,9 @@ genepi-18:
       mac: 00:30:48:96:d3:4d
       ip: 172.17.16.18
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
index 1da847606bff683fb9cf7ea4fb918555558f8b81..3e7301856eaaa9d9eb0e2f507b5e5c6b4911f65b 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.yaml
@@ -57,9 +57,9 @@ genepi-19:
       mac: 00:30:48:96:d1:f5
       ip: 172.17.16.19
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
index 389e5aced91d0dfa07be15f097b7f3f16e63ca74..83eb2d0450aa444767ecd1da42f7aa13c7d35e22 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.yaml
@@ -57,9 +57,9 @@ genepi-2:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
index 5050b221def51a8860c7ec2f6415f46b98488d4d..f32b3b1ff94ae7f40739d4c20c7941d6b0aa21d1 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.yaml
@@ -5,9 +5,9 @@ genepi-20:
     vendor: Phoenix Technologies LTD
     version: 1.1a
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     ib0:
       mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
index 1441fd815ae3844a5407bed39e0309b66d62862a..4bfb63df713f5db99c09abdda7b2423bc3127ff6 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.yaml
@@ -57,9 +57,9 @@ genepi-21:
       mac: 00:30:48:96:d3:56
       ip: 172.17.16.21
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
index f182a90273a21f736efe8bafd58aca8575e353a5..56dd03470e9a120d3622c23206dd0fc20aa3f1d1 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.yaml
@@ -5,9 +5,9 @@ genepi-22:
     vendor: Phoenix Technologies LTD
     version: 1.1a
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     ib0:
       mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
index 1d0f7935a64ac38ceb6f20506e76715e7305fed7..db02c1e40c36ca580ea92ea0303e37c8386b3377 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.yaml
@@ -11,9 +11,9 @@ genepi-23:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     ib0:
       mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
index 80d3b2ce7e92e428ec7d57b0af2b975b62de3344..3d524aa76ab589be0d6d5437fcb0cb4d31df18ca 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.yaml
@@ -57,9 +57,9 @@ genepi-24:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
index 5be3f2cec88a870c021c2084e3ca16f346046f02..d28e7620062a0f2d2b5430d5a3f209228ac8abb7 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.yaml
@@ -5,9 +5,9 @@ genepi-25:
     vendor: Phoenix Technologies LTD
     version: 1.1a
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: WDC WD1600YS-01S
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
index 6cd3a67605786b04bb19b44d0ea5a6ff9cfbd3b7..c499dfd6923023798d5d535c003673be50717784 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.yaml
@@ -57,9 +57,9 @@ genepi-26:
       mac: 00:30:48:96:d6:08
       ip: 172.17.16.26
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
index 9daf02ecf9d5c3a236267cea6f9cd8a51658b0c4..c2055cb7327e1e97c54047537a3132b2b3177523 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
@@ -11,9 +11,9 @@ genepi-27:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     ib0:
       mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
index 4dd541f56f54eebd42ccb3b6f3f9754eafed5f43..7a51716740afd54a88f0706297bf933c127e4ef4 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
@@ -51,9 +51,9 @@ genepi-28:
       mac: 00:30:48:96:d7:76
       ip: 172.17.16.28
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: WDC WD1600YS-01S
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
index 3ee365d79fdedc871ba6a15cf7cf139fe38761ab..144bc220e130a778dbfb57e50ffd5688121cd155 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.yaml
@@ -51,9 +51,9 @@ genepi-29:
       mac: 00:30:48:96:d2:db
       ip: 172.17.16.29
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: WDC WD1600YS-01S
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
index 7a248b45f2f6964d45e6a513b08a6b73227950ef..1827187f96e420674a8f358c8c102ca115a549f4 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.yaml
@@ -57,9 +57,9 @@ genepi-3:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
index 1b2f66ab805d06741673bf5ec54d1105aefd63aa..a4c4d7dd7869d8885ab17cf9d838af4b4ffc4f26 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.yaml
@@ -51,9 +51,9 @@ genepi-30:
       mac: 00:30:48:96:d4:2f
       ip: 172.17.16.30
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: WDC WD1600YS-01S
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
index e18e25766da23ac0d613ac439e94e795356e917f..eecd310bcf768d68fd2f7f9ecf73a4e75eb0b956 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.yaml
@@ -57,9 +57,9 @@ genepi-31:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
index 8cd8422404a8883507c7b37afbe51260f0ffa437..12c8e5dfe802ebc4cd06a154ed23b57aa1471f76 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.yaml
@@ -51,9 +51,9 @@ genepi-32:
       mac: 00:30:48:96:d7:84
       ip: 172.17.16.32
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: WDC WD1600YS-01S
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
index 46cdb67e7bc5683b6a703de2c16e13360a0930b8..b9f08f483eb0df2235caffab90802ea9782baf3f 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.yaml
@@ -57,9 +57,9 @@ genepi-33:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
index 92fa4cffb37a3fc6174092077ca34a1ceea29ef9..0c12e59fbb99a473ce68061b15490538c53c4198 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
@@ -57,9 +57,9 @@ genepi-34:
       mac: 00:30:48:96:d2:dd
       ip: 172.17.16.34
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
index 707c39497ff433c0ecf8e28efc5b83e0341a414b..0d27bc08d04a8787e0ae85ac113e238cef2da9c0 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.yaml
@@ -11,9 +11,9 @@ genepi-4:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     ib0:
       mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
index 0ef7f92032c2b2abfeba2bff9ae640b8f55e62eb..a5d55cf1c81fe021bbbc90d979af32952fc3d478 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.yaml
@@ -51,9 +51,9 @@ genepi-5:
       mac: 00:30:48:93:39:e8
       ip: 172.17.16.5
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: WDC WD1600YS-01S
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
index 68079bf7e7bc26c0a1a08e3ad21007feadb96a27..26609da3ee47c6edfe8fcbb4805ddae8d746c215 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.yaml
@@ -57,9 +57,9 @@ genepi-6:
       mac:
       ip: 172.17.16.6
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
index 975d3279bc8a906f3406359e973143b335165c64..2426e9c5890d14b1ee9c61770c9ea20dd4a71db6 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.yaml
@@ -57,9 +57,9 @@ genepi-7:
       mac: 00:30:48:96:d1:d2
       ip: 172.17.16.7
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
index 1675a27f54980306580e33b56097a41b92afc33a..5af43aaad27b95f88461f2dff5a9c5b15a5ff07d 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.yaml
@@ -11,9 +11,9 @@ genepi-8:
       rev: 6.0
       vendor: Western Digital
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     ib0:
       mounted: true
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
index 1a6f4410753f38b3c4811ae28d16d9c1944b7175..5e97b66cbb4b810224893dd81b9e5b5780b529fd 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.yaml
@@ -5,9 +5,9 @@ genepi-9:
     vendor: Phoenix Technologies LTD
     version: 1.1a
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     ib0:
       mounted: true
diff --git a/input/grid5000/sites/lille/clusters/chimint/chimint.yaml b/input/grid5000/sites/lille/clusters/chimint/chimint.yaml
index a2940434a152626eab62240436c701a8e87e0bff..ea0c86cf0a266c76d65233301928d00e55c3fb45 100644
--- a/input/grid5000/sites/lille/clusters/chimint/chimint.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/chimint.yaml
@@ -11,9 +11,9 @@ nodes:
 # Global node properties
   chimint-[1-20]:
     operating_system:
-      kernel: 2.6.32-5-amd64
+      kernel: 3.16.0-4-amd64
       name: debian
-      version: 6.0.6
+      version: '8.2'
     processor:
       cache_l1d: 32768
       cache_l1i: 32768
@@ -31,16 +31,20 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
         driver: megaraid_sas
-        raid: 0
+        raid: '0'
         storage: HDD
         vendor: DELL
     network_adapters:
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
index a99f10ca397705098917fb0596efc66095930ff1..e1a9d2876579ec21db54a5a1db9f2d77e50bbf5c 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
@@ -36,9 +36,9 @@ chimint-13:
       rev: 2.1
       vendor: DELL
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   chassis:
     serial: 9RM1Z4J
     manufacturer: Dell Inc.
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml b/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
index b2d92d561aae618e8503aa7f68db8743acd5d32d..70859bdf757fce9cfb7d3572871cce92a7b4922e 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml
@@ -15,11 +15,15 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:    
         interface: SATA II
@@ -38,7 +42,7 @@ nodes:
         version: 80003ES2LAN
       myri0:
         vendor: Myricom
-        version: 1000000000-PCIE-8A-C
+        version: 10G-PCIE-8A-C
         management: false
         switch: switch-myri
       bmc:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
index bc024ce8375b770210d6e1e11987151e307b7d2c..17b3a77ca28570e691aa0e5b61a9488335ec4e35 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.yaml
@@ -46,9 +46,9 @@ chinqchint-1:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
index 858ea5a06a2a191437b54ed23e64fc7347c6ff9a..1fbcb91a5e9242a33004a909558b01add8d60be8 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.yaml
@@ -41,9 +41,9 @@ chinqchint-10:
       mac: 00:30:48:94:2d:7a
       ip: 172.17.34.110
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
index 0f2336397bc9799ac8c89208ce26df1ce908f4c6..ba3290aeb3801783469aba343cdb47a2ae20aeeb 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.yaml
@@ -10,9 +10,9 @@ chinqchint-11:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
index 5cfad1802d4a8ef257d19e064a469384e83cf9a4..47c420cf2ff70ae5a428cd93800564611762eace 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.yaml
@@ -10,9 +10,9 @@ chinqchint-12:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
index 01bd402608e5cd5cc4d3e647681407a583880a85..b96c29b210a53cde551550be2422e5d7cb24148c 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.yaml
@@ -5,9 +5,9 @@ chinqchint-13:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
index 0055664eca342696e977b3bf9f2d47f68d3adc7b..db9f8f30ec21b914b7caf38a3747fd9741941759 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.yaml
@@ -5,9 +5,9 @@ chinqchint-14:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
index 1b672866bdc4ea14e79444a91e8fb93975804bd1..58172e28b7993d3e7a4bbf7d0f692c7f448ed1ef 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.yaml
@@ -10,9 +10,9 @@ chinqchint-15:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
index 1e0b4d464e47681b3672f12e0aedef0b1144b8fa..bea9a09c47b5626cad86370a04c19fec25965f65 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.yaml
@@ -41,9 +41,9 @@ chinqchint-16:
       mac: 00:30:48:96:24:e1
       ip: 172.17.34.116
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
index 0b4fd586300032ebc6702109636230a529757858..31f7d005e8401afb7146ffbd7b5d1fb4da5d5b26 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.yaml
@@ -46,9 +46,9 @@ chinqchint-17:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
index 2b69f0c2d553669ba3dba062036a7d5a47b063e3..94e34231926b730bdbe666f6690738fa7835f1d4 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.yaml
@@ -46,9 +46,9 @@ chinqchint-18:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
index 029ddaadc22ab0fcaeee10d5167d9310c8c66ac6..0b817cd710fa5daed194024551b513f687e9fe21 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.yaml
@@ -10,9 +10,9 @@ chinqchint-19:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
index 685ebc85c602364045b4e0d8be56a32f48dcdc81..69f9f40fc9999ae2b4aae1840b9b34f56666db4d 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.yaml
@@ -5,9 +5,9 @@ chinqchint-2:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
index 9e593ddc3cff14678a49eafd79c5061f78bd3c27..21bb08a98a88f16b19787f888021b253d349414e 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.yaml
@@ -46,9 +46,9 @@ chinqchint-20:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
index 0916e17c706f8d8c4a12f85467f560b7bae5638f..822843a411749e41f89a2d1a6628db68909aa8a1 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.yaml
@@ -5,9 +5,9 @@ chinqchint-21:
     release_date: 04/09/2008
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
index b5c7719c5836cd9589854b6d1e128d4ea18c0ee0..97b66b74d7a358b2b9044b145923573c3c439a15 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.yaml
@@ -41,9 +41,9 @@ chinqchint-22:
       mac: 00:30:48:94:4b:02
       ip: 172.17.34.122
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
index 1569b963c0c0a171e19f9ef0bd621653466dcc15..c5960f05ffc20dc18fed45eef61e22497597e2a5 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
@@ -5,9 +5,9 @@ chinqchint-23:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
index 23830b4de2df993a450e9196059c9754d67b8ebd..f6aea59715ddea609c69e2340be128d165d099ec 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.yaml
@@ -10,9 +10,9 @@ chinqchint-24:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
index 790bd5a89d4d2149871df445f26e7e4bebf945a0..6b85a42451ed32d73877eafc30b3d912a39db8e8 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.yaml
@@ -46,9 +46,9 @@ chinqchint-25:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
index e9c37febdc174337c22813876daf60f9d49b437f..ecb186adfb9465fb2231b648e9a82d2a67fdafc6 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.yaml
@@ -5,9 +5,9 @@ chinqchint-26:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
index 23e3cc2e3ee119bd9bc0baababd1cd5ac0288298..b2a43c5d822e572b922af748eecd1cec0b7bcd94 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.yaml
@@ -46,9 +46,9 @@ chinqchint-27:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   chassis:
     serial: X0004747
     manufacturer: SGI.COM
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
index 9cd6d4b3cf1e02f15c9944e37e1df8b189b3178d..4fb227ecdef82fed6347fdb07825bb5f4d9df58a 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.yaml
@@ -10,9 +10,9 @@ chinqchint-28:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
index 8da6be0cd637ee07e1fe512bf359213affe3ba69..d6942bffee7f5d9da18486d7cf95c7c1ba4e042f 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.yaml
@@ -46,9 +46,9 @@ chinqchint-29:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
index 67c003f858519a4c56fc63d0c5dd09d58bb96d90..671cb77833b9993bc27c305ba1b548f54807b941 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.yaml
@@ -5,9 +5,9 @@ chinqchint-3:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
index 9f0440881f7fbfbfb1bb985b33a24475972fbfa8..79cbd093d8ef1d1d740f1d2f7f2ea15cf4172a1e 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.yaml
@@ -5,9 +5,9 @@ chinqchint-30:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
index 60b640d56abd9221fa63b633422a0fcec2a0c7f1..3a5ce36c7c68fdbd0085e6e4b157a13d4a55aa79 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.yaml
@@ -41,9 +41,9 @@ chinqchint-31:
       mac:
       ip: 172.17.34.131
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
index 5365db95753263872c0ade0d48135c4015424fe4..4cf4b24ba2ae05f12e1368699c0cbae7c080ec65 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.yaml
@@ -5,9 +5,9 @@ chinqchint-32:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
index 2254ab5735518d3b83c00df0caa516cffb39cefb..826c3b6cd57fac4f12015f12d39548fde77e8bec 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
@@ -46,9 +46,9 @@ chinqchint-33:
       size: 250059350016
       rev: 3.0
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
index d2329a54cb06b4fdc3f816f9313bbc87125bbcc8..a8ed04ce5d932cc9aab1efa5ef7186ad3f88d2ac 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.yaml
@@ -5,9 +5,9 @@ chinqchint-34:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
index bce0a45c8543ad820afb865db1bed7121b438717..d2039200b1a52509d8449daa7df0a1573f887c2c 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.yaml
@@ -46,9 +46,9 @@ chinqchint-35:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
index 43ad4b39953e820a6f38818f065ef3da7c0080e7..00328f9d56a30f5b7287ad3531698e5833e5b51b 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
@@ -46,9 +46,9 @@ chinqchint-36:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
index 4b154629b231582c73bd1b88dcf44325f7c613de..7a91a95799b29b9d18ee50d11befdcf674e57d0f 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.yaml
@@ -5,9 +5,9 @@ chinqchint-37:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
index 4d843b943be79af9a4228a070c1d02a2ef792bdc..68e8326922008b72ae5f256a9d86992424511dee 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.yaml
@@ -41,9 +41,9 @@ chinqchint-38:
       mac: 00:30:48:94:1c:9a
       ip: 172.17.34.138
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
index 84510fe82fea9eb59ad8bd349e3f6d1957d2d99e..280e11e3015efd6e8a0928f9d6bfd3b0c60a0d0b 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.yaml
@@ -41,9 +41,9 @@ chinqchint-39:
       mac: 00:30:48:94:2f:6e
       ip: 172.17.34.139
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
index 2c1ef65f80a2bcf06ef7d65a4a4f12bbbabf4c73..3839baf8f4c98414e802e22577db93372d852433 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.yaml
@@ -5,9 +5,9 @@ chinqchint-4:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
index 48e767f4344018c711236da426896c06f2972f14..4ed0f9ce345cac2827cb578b6c9bc18c143b9953 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.yaml
@@ -46,9 +46,9 @@ chinqchint-40:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
index 12ca2260d9f945a33dc6bca35b70937f1394cc5e..884ed600bafabff68b52ecc9f0f8d2341082a249 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.yaml
@@ -46,9 +46,9 @@ chinqchint-41:
       mac: 00:30:48:96:07:ef
       ip: 172.17.34.141
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   chassis:
     serial: X0004756
     manufacturer: SGI.COM
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
index 07ef3b43e527f20425e9c66eb13c9302d503d7b6..cae7f4812059bc290db4b8a34c27bddc2bb88c74 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.yaml
@@ -46,9 +46,9 @@ chinqchint-42:
       mac: 00:30:48:96:07:f1
       ip: 172.17.34.142
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   chassis:
     serial: X0004756
     manufacturer: SGI.COM
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
index 095b002f642edd86d5e51557bfee90df6995309d..a0ad93394996036924e577e6fdbadef654bfc138 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.yaml
@@ -5,9 +5,9 @@ chinqchint-43:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
index 6d223e7118d5748a5036ea18e0269295b7785e8e..41422fe6d34acd8ad4453a86ec0be67157cd7145 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.yaml
@@ -46,9 +46,9 @@ chinqchint-44:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
index f327688020374c6caca990baf1ab0ce9275151ca..d160b2c8ff95a7a4dd40e30bbae890b40503a9ee 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.yaml
@@ -41,9 +41,9 @@ chinqchint-45:
       mac: 00:30:48:96:25:65
       ip: 172.17.34.145
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
index 4a4e799b24359f8899ec5263165df5a621986156..c790ebda13f8289f08e05cfcd6e3dca2e45185d6 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
@@ -46,9 +46,9 @@ chinqchint-46:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
index 750d7ff346e5b9144e97921dfedc132011fe8e2e..e8d92804ab3951ad96ff0e4704b3faabe53f3619 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.yaml
@@ -46,9 +46,9 @@ chinqchint-5:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
index 46d6598322eec9a01d7ecf98645166ee8d6479cd..5de755248f9ac0760523a08114b548735c102f7d 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.yaml
@@ -5,9 +5,9 @@ chinqchint-6:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
index acb0320fe57b20f97283845de24e57d07759eb84..17370dff7402e7ff72a8ff7b6c247be6fd540e59 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.yaml
@@ -5,9 +5,9 @@ chinqchint-7:
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     myri0:
       mounted: false
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
index d5e7aa7cded3ca20e2f5a42059cb86c8b480cf8e..6aa09b55311a6df176f1cd67ad8cc54a88d83497 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
@@ -46,9 +46,9 @@ chinqchint-8:
       size: 250059350016
       rev: A7EA
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
index 5be4e0db3b6c96d75cc0bdb24911fa8aff1717ad..ac346f835c85128929302a4bef6a6b4116d0b55c 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.yaml
@@ -41,9 +41,9 @@ chinqchint-9:
       mac: 00:30:48:94:1b:e2
       ip: 172.17.34.109
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: Hitachi HDT72502
diff --git a/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml b/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml
index 84c9cbc97c29f4f491aaea91aeb40cc696d18950..2e70c8825391c26cfeb573a07a8de2a455c00d49 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml
@@ -1,6 +1,6 @@
 model: Dell PowerEdge C6100
 created_at: 2011-03-25
-priority: 201199
+priority: '201199'
 kavlan: true
 queues:
   - default
@@ -9,9 +9,9 @@ queues:
 nodes:
   chirloute-[1-8]:
     operating_system:
-      kernel: 2.6.32-5-amd64
+      kernel: 3.16.0-4-amd64
       name: debian
-      version: 6.0.6
+      version: '8.2'
     processor:
       cache_l1d: 32768
       cache_l1i: 32768
@@ -33,16 +33,20 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
         driver: mptsas
-        raid: 0
+        raid: '0'
         storage: HDD
         vendor: SEAGATE
     network_adapters:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
index 8dbc59a364527e4ba112204f28880d83456ed045..374de251766c518588d5336b8a9d36652d1699c8 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.yaml
@@ -30,9 +30,9 @@ chirloute-1:
       mac: 00:26:6c:f9:18:e7
       ip: 172.17.35.101
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST3300657SS
@@ -40,9 +40,9 @@ chirloute-1:
       rev: ES64
       vendor: SEAGATE
   chassis:
-    serial_number: D385Z4J
+    serial: D385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
index 9b196b48e04485dcd28a3a7e590ae4281d8afff4..d6491a7d48e8485677c915bb4c9c8be695d2d66a 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.yaml
@@ -5,9 +5,9 @@ chirloute-2:
     release_date: 12/23/2011
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST3300657SS
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
index 04d929b8a8e2dc4031484623f5138ba5b5a12c77..f0b6ca4eb7888bcf82f836160cb62a78e35ca28f 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.yaml
@@ -5,9 +5,9 @@ chirloute-3:
     release_date: 12/23/2011
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST3300657SS
@@ -40,9 +40,9 @@ chirloute-3:
       mac: 00:26:6c:f9:15:73
       ip: 172.17.35.103
   chassis:
-    serial_number: D385Z4J
+    serial: D385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
index 322fc5b5717545b662b605d46e9650462c32e5ab..b6e787d38e9e25c168271628c719b01cc5368f31 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.yaml
@@ -5,9 +5,9 @@ chirloute-4:
     release_date: 12/23/2011
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST3300657SS
@@ -42,9 +42,9 @@ chirloute-4:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: D385Z4J
+    serial: D385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   main_memory:
     ram_size: 8580497408
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
index a291862ba748776f34af328d794baca7c5d4f6b5..68c5944dac1410531724ddc44f0d202cb8fc30c9 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.yaml
@@ -5,9 +5,9 @@ chirloute-5:
     release_date: 12/23/2011
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST3300657SS
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
index 15383eb15acd4b6d0be0a30975b7e525e33e3b89..9869a177e87ce0ce0bcce0429db5de37aad767a2 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.yaml
@@ -30,9 +30,9 @@ chirloute-7:
       mac: 00:26:6c:f9:17:ba
       ip: 172.17.35.107
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST3300657SS
@@ -40,9 +40,9 @@ chirloute-7:
       rev: ES64
       vendor: SEAGATE
   chassis:
-    serial_number: F385Z4J
+    serial: F385Z4J
     manufacturer: Dell
-    product_name: C6100
+    name: C6100
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
index 922edfe2d14b8744ab7b2fb7d71acd879907c3b4..257e792caf4ab44d4d27b77bcf0d9c850655ae93 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.yaml
@@ -5,9 +5,9 @@ chirloute-8:
     release_date: 12/23/2011
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST3300657SS
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
index 8caf92b3b0727b08a724b36b74b209d6b652f913..0a6cae8a4b41942fdc1cd55d29d14fc2c0b253b0 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
@@ -8,9 +8,9 @@ queues:
 nodes:
   granduc-[1-22]:
     operating_system:
-      kernel: 2.6.32-5-amd64
+      kernel: 3.16.0-4-amd64
       name: debian
-      version: 6.0.6
+      version: '8.2'
     processor:
       cache_l1d: 32768
       cache_l1i: 32768
@@ -28,11 +28,15 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SAS
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
index 6fbe3436257f167b3153768e90d14390a37eb769..69a2aa72ab6772417c8480b701423e641f1fa366 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
@@ -11,9 +11,9 @@ granduc-11:
       rev: D406
       vendor: FUJITSU
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     eth0:
       mounted: true
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
index 1649446539d23b67a6d0b19e28b36406cfe586ec..2e1d4e0dba79e86762de12c2350c2e0661ffa50e 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
@@ -5,9 +5,9 @@ granduc-3:
     release_date: 10/30/2010
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: MBB2147RC
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
index e1a31022cbe8fc412c7026df08c87b8b51d5a2fa..dac3bc1688b6e94746164db3fca05ab037a968e2 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
@@ -48,9 +48,9 @@ granduc-9:
       ip: 172.17.176.9
       mac: 00:1c:23:d3:42:88
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST9146802SS
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
index 575f93696211fc79c8a589440b47473b9e322a2d..49409655dc56561cde5300ed8a33a63ad033683e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.yaml
@@ -1,9 +1,9 @@
 ---
 petitprince-8:
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 7.1
+    version: '8.2'
   architecture:
     smp_size: 2
     smt_size: 12
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
index e114bdb9607f70077ddcc8cf90fddbcfc696d71f..1c7742fd29ba8e0fe528d7428a2e4b296748027e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
@@ -8,9 +8,9 @@ queues:
 nodes:
   petitprince-[1-16]:
     operating_system:
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
       name: debian
-      version: 7.1
+      version: '8.2'
     processor:
       cache_l1d: 32768
       cache_l1i: 32768
@@ -28,11 +28,15 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
index 60666a3a299f8964272aedcf7a9ad72a9fe9a90f..393e01993e4ffe98452d251bbe32b3f6fb1d013d 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
@@ -9,10 +9,6 @@ queues:
 
 nodes:
   hercule-[1-4]:
-    operating_system:
-      kernel: 2.6.32-5-amd64
-      name: debian
-      version: 6.0.6
     processor:
       cache_l1d: 32768
       cache_l1i: 32768
@@ -30,11 +26,15 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      virtual: ivt
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
@@ -48,10 +48,11 @@ nodes:
         interface: SATA
         driver: ahci
         storage: HDD
+    network_adapters:
       eth0:
         enabled: false
         mountable: false
-        rate: 10.0+e9
+        rate: 10000000000
         bridged: false
         vendor: Intel
         version: 82599EB 10-Gigabit SFI/SFP+ Network Connection
@@ -64,7 +65,7 @@ nodes:
       eth2:
         enabled: true
         mountable: true
-        rate: 100.0+e6
+        rate: 100000000
         bridged: false
         vendor: Intel
         version: Intel Corporation
@@ -77,7 +78,7 @@ nodes:
         version: Intel Corporation
       bmc:
         interface: Ethernet
-        rate: 1.0e+9
+        rate: 1000000000
         enabled: true
         mounted: false
         mountable: false
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion.yaml b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
index 92b23002d27fb6f824ffa086b7631a8152eb1a5a..76aaa88071b5eb705f99eb27169db6dda5f45b59 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
@@ -8,10 +8,6 @@ queues:
 
 nodes:
   orion-[1-4]:
-    operating_system:
-      kernel: 2.6.32-5-amd64
-      name: debian
-      version: 6.0.6
     processor:
       cache_l1d: 32768
       cache_l1i: 32768
@@ -29,17 +25,22 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      queues:
+        - default
+        - admin
+      max_walltime: 0
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SCSI
         driver: megaraid_sas
         storage: HDD
         vendor: null
+    network_adapters:
       eth0:
         enabled: true
         mountable: true
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
index c9653c65274a987c6f2455b6390e601a13f0cd76..97b810f5b04b87926fe622283e4d833112a67a6b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
@@ -30,14 +30,14 @@ sagittaire-10:
       mac: 00:09:3d:11:aa:e3
       ip: 172.17.49.10
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
   supported_job_types:
     virtual: false
   chassis:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
index 22047bfe366a300b3166090656e447a0e2cc0d71..25153e7f2a39f6198573a3314bd62a4e8b14da91 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
@@ -5,18 +5,18 @@ sagittaire-21:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
index a6a11b0a19b0408e9ce3a9b4f64b96a197dce4ff..3d354f155e18d7641753777db9fa735ad7391f29 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
@@ -5,18 +5,18 @@ sagittaire-25:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
index fef64717b0432842b50e21c4889bb009d069df07..7d6c6c30cf45bb6a3739aa23934c3d24c8ac90a2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
@@ -33,11 +33,11 @@ sagittaire-26:
     sda:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   chassis:
     serial: XG052083140
     manufacturer: Sun Microsystems
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
index 202e4752502e0a4f5d6105d51cc4ac2f41c096a6..43c5a3d8dde21e3bb3be0d8460cdeba3db4fb178 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
@@ -5,9 +5,9 @@ sagittaire-28:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     eth0:
       mounted: false
@@ -37,7 +37,7 @@ sagittaire-28:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
   supported_job_types:
     virtual: false
   chassis:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
index e7f35515f5b4c87a50ddfd17cb4c3dae0864d266..0c7a720b8bf5e07164a18acf78a35e294fdae426 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
@@ -5,18 +5,18 @@ sagittaire-35:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
index 5db06a31879c15668071b62e8b3ff86dcd079be0..3f7e9f28a1f52c7e65fe4fc2c80af9554e565e0b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
@@ -5,18 +5,18 @@ sagittaire-36:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
index 15ffba9c58408ae65f2bedc31ad30694d1cb509f..175012f65a957657478e7292dd727da9bb1485b9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
@@ -8,11 +8,11 @@ sagittaire-37:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
index 80f1009690463a1a2fba168fd612870b5ca7a206..bddde0f870128d777449acb4c12471fa90d22a70 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
@@ -5,18 +5,18 @@ sagittaire-40:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
index c27c2726003ddb5c995b83d123f3d7e1d9f67b3b..83f3c6a2bb0510f5869eb57cbf879d3fd0bf03d0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
@@ -5,18 +5,18 @@ sagittaire-41:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
index 77bc4e1c5e6c25cdbdf96aa148e711ae342edfcf..21948d575ee30d77c122f796491bc714faa3023c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
@@ -30,14 +30,14 @@ sagittaire-60:
       mac: 00:09:3d:12:6b:3d
       ip: 172.17.49.60
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
   chassis:
     serial: XG052310130
     manufacturer: Sun Microsystems
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
index 9a17122362f8532b464120b8b60890bb4dfc997b..3463a3bdada76ecfd6e2cab7324ecfff6f4e1761 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
@@ -5,18 +5,18 @@ sagittaire-62:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
index e352e405bfd65da2934b7acb7abf54e9c8b44ed5..16b6c5ff77d020cce9e0ddfdf23bed79983ec5c1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
@@ -5,18 +5,18 @@ sagittaire-68:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
index 168fddd2a00aec19d792db76d483ff2732437312..79fd757902453d449acef4362a6d734a98461e95 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
@@ -5,18 +5,18 @@ sagittaire-70:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
index c4cca89b224e955bf6e8405b22e4285b576a56db..4603d6ab682a7e2c4dd3fe17f11fb6e326f93e6b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
@@ -5,18 +5,18 @@ sagittaire-73:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
index a58f2546a3d4dc45ec8f46e9890289c5bad97b0e..6a4538cafe927b78b5056abb2c77c1421a550985 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
@@ -5,18 +5,18 @@ sagittaire-76:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
index 1c3a5a329c8475f591837ce55cda4e10643a0a42..5c64eb82ea7c5e1228718b0ce4e35dcc30cbf4d8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
@@ -5,9 +5,9 @@ sagittaire-77:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: MAT3073NC
@@ -16,7 +16,7 @@ sagittaire-77:
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
index 938d4311797a29635c96270fa9f26dc4701da4af..3057e35604344f38d7534fc4f0e001ed76d7b791 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
@@ -30,18 +30,18 @@ sagittaire-79:
       mac: 00:09:3d:11:cd:8d
       ip: 172.17.49.79
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   supported_job_types:
     virtual: false
   chassis:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
index 317bb4f9e56e0affe84abca36ef0ff558bb2f959..5309e07e5c3498754a0241119cc6b3f68e474edc 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
@@ -5,18 +5,18 @@ sagittaire-8:
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: ST373207LC
       size: 73407868928
-      rev: 2
+      rev: 2.0
     sdb:
       model: MAT3073NC
       size: 73543163904
-      rev: 104
+      rev: 104.0
   network_adapters:
     eth0:
       mounted: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
index b8aa8a2c643c535b518e1d7e8064969b8ecd478d..f379be748b27f5dc1465284af35e898b02352cd7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml
@@ -8,10 +8,6 @@ queues:
 
 nodes:
   sagittaire-[1-79]:
-    operating_system:
-      kernel: 2.6.32-5-amd64
-      name: debian
-      version: 6.0.6
     processor:
       cache_l1d: 65536
       cache_l1i: 65536
@@ -29,11 +25,15 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      queues:
+        - default
+        - admin
+      max_walltime: 0
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SCSI
@@ -255,7 +255,6 @@ nodes:
     storage_devices:
       sdb:
         model: MAT3073NC
-        rev: 104
         size: 73543163904
   sagittaire-23:
     chassis:
@@ -416,7 +415,6 @@ nodes:
     storage_devices:
       sdb:
         model: MAT3073NC
-        rev: 104
         size: 73543163904
   sagittaire-42:
     chassis:
@@ -445,7 +443,6 @@ nodes:
     storage_devices:
       sdb:
         model: MAT3073NC
-        rev: 104
         size: 73543163904
   sagittaire-44:
     chassis:
@@ -594,7 +591,6 @@ nodes:
     storage_devices:
       sdb:
         model: MAT3073NC
-        rev: 104
         size: 73543163904
   sagittaire-55:
     chassis:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
index 4b74ac2d83bf5842956791717671f53219ba64af..a6fba732402c1db4825d3bff798b720c4507029b 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
@@ -66,15 +66,15 @@ taurus-1:
       size: 598879502336
       rev: 3.13
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 8HTHD5J
+    serial: 8HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   main_memory:
     ram_size: 34359738368
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
index 7dbcee152e1d3b12172b7fd1ba435241847c0f8e..c2d43f9e532692c4b289e62952554d36b30a677f 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -66,13 +66,13 @@ taurus-10:
       size: 598879502336
       rev: 3.13
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   chassis:
-    serial_number: 4HTHD5J
+    serial: 4HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
index c341a2699c6070368961df3c421c0797368d9a22..a365166312017bc7d89115cd5a3a2d44f272e27d 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
@@ -61,9 +61,9 @@ taurus-13:
       mac: d4:be:d9:fb:ec:40
       ip: 172.17.48.13
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: PERC H710
@@ -72,9 +72,9 @@ taurus-13:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: CHTHD5J
+    serial: CHTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
index fdc34a05d09d2e886c16380acb7dced8e806c884..dd5c16bbda2cb936a13bac00015f4829b66f6ee5 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
@@ -5,9 +5,9 @@ taurus-14:
     release_date: 01/22/2016
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: PERC H710
@@ -70,9 +70,9 @@ taurus-14:
       mac: d4:be:d9:f9:a3:4c
       ip: 172.17.48.14
   chassis:
-    serial_number: DHTHD5J
+    serial: DHTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   main_memory:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
index 5aca4d67173a00ef588a08db250604ba3309764f..a5a153caec8972b964306adc24e563b5d1f01da6 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
@@ -5,9 +5,9 @@ taurus-2:
     release_date: 01/22/2016
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     eth0:
       mounted: true
@@ -70,9 +70,9 @@ taurus-2:
       size: 598879502336
       rev: 3.13
   chassis:
-    serial_number: 6HTHD5J
+    serial: 6HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
index 58a49719d6e3c9ca690d6e6471389e8965cb12fe..be0a0fef7c37b51eaf0eda1ea79c6985e96e12cb 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
@@ -61,9 +61,9 @@ taurus-3:
       mac: d4:be:d9:fb:ed:04
       ip: 172.17.48.3
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: PERC H710
@@ -72,9 +72,9 @@ taurus-3:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: 7HTHD5J
+    serial: 7HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   processor:
     model: Intel Xeon
     cache_l1d: 32768
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
index fb603c3580bd678b753c800448ae5dcdadbad20a..195fab51cfedc90de9dbddfff40b239e22495b3e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
@@ -5,9 +5,9 @@ taurus-6:
     release_date: 01/22/2016
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     eth0:
       mounted: true
@@ -70,9 +70,9 @@ taurus-6:
       size: 598879502336
       rev: 3.13
   chassis:
-    serial_number: HHTHD5J
+    serial: HHTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
index 6e7c87db6dcd8f0492e831948cbf50fe7e735c2c..e6102d85e4c55e83f4e52d90d1c4ab64a88594d2 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
@@ -61,18 +61,18 @@ taurus-7:
       mac: d4:be:d9:fb:ef:c8
       ip: 172.17.48.7
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: PERC H710
       size: 598879502336
       rev: 3.13
   chassis:
-    serial_number: 2HTHD5J
+    serial: 2HTHD5J
     manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+    name: PowerEdge R720
   supported_job_types:
     virtual: ivt
   processor:
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
index 48c4f374bf1637b4184b2c85870e094ded95e5ae..725a9baf7d0172c66a5898712864eb19d80a0afe 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
@@ -9,11 +9,11 @@ queues:
 nodes:
   taurus-[1-16]:
     chassis:
-      product_name: PowerEdge R720
+      name: PowerEdge R720
     operating_system:
-      kernel: 2.6.32-5-amd64
+      kernel: 3.16.0-4-amd64
       name: debian
-      version: 6.0.6
+      version: '8.2'
     processor:
       cache_l1d: 32768
       cache_l1i: 32768
@@ -31,16 +31,21 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SCSI
         driver: megaraid_sas
         storage: HDD
+    network_adapters:
       eth0:
         enabled: true
         mountable: true
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
index 1d655e14e6fdd277e61c10f81955ed6c54a6dec1..65d0598bde45abc192c2b37ed0172b77f6865f98 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
@@ -10,7 +10,7 @@ talc-1:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml
index a90e94f2a180e7b8dde19ea70595d3bbc56e6ebf..9d8df496b164e4b98bc28a381ebfcebbd679e7ef 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml
@@ -14,7 +14,7 @@ talc-10:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml
index f22bb98794f6b6301fabd3bcf5c64778cf11fa18..20c56296ca8fbe843fcb41878a205f37f4f2a0f4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml
@@ -10,7 +10,7 @@ talc-103:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
index 9edea19d42976dd893cc802778736e9359a91070..31932097a4cfa81b9f810faff7c5ac7022cb5c34 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
@@ -14,7 +14,7 @@ talc-104:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml
index 14ebdce19da06bb8a45cb78ccce1bb56609b086c..065d8ab1a5cb425bdae2d3bb6638dc61a1f65016 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml
@@ -14,7 +14,7 @@ talc-105:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
index 2fc2171fede83f81b0842b3acd3bcc7c838bcd31..0a813ce62b89e41d2345be05f4e009fffaf1e587 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
@@ -14,7 +14,7 @@ talc-11:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
index bb066256455eba61be0d8a44b300519ed3c93275..5fc54505eb5b8641097f9b0de222b66456b98600 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
@@ -10,7 +10,7 @@ talc-110:
       model: Hitachi HDT72103
       rev: A3AA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml
index 3bf9b58d3deb2678394334800d8137639782e794..f4633df99a3eeea86162745187450d824c5aaa15 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml
@@ -14,7 +14,7 @@ talc-111:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml
index 2b130e64f574eda849ffadf049d277a6cec728d3..3da2339a4e134381a1fdb1ce32de8dfd07146b3f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml
@@ -14,7 +14,7 @@ talc-112:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
index bc79f7ec57d2073856254b86ef7a499585c9804b..05fdef6f0f82c0b02ba0766b1e1e7fc3a9708be2 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
@@ -10,7 +10,7 @@ talc-114:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml
index 301c9033bd172eba5e608fa236832fabee2c0ecf..0329d574a10e89befb5d054e670aa47b8a77ea8f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-115.yaml
@@ -10,7 +10,7 @@ talc-115:
       model: Hitachi HDT72103
       rev: A31B
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml
index 334e9c0ff14a9edcbf12ce98a500f56e698fde9d..b8373e8f11bafac5bbbb9410986e4e710403566e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-116.yaml
@@ -10,7 +10,7 @@ talc-116:
       model: Hitachi HDT72103
       rev: A31B
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml
index 524284a00d775c0bc99db464533ac69f8b57b727..9b181513a05ed8bb1839f85c417382c58c34cbc2 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-117.yaml
@@ -10,7 +10,7 @@ talc-117:
       model: Hitachi HDT72103
       rev: A31B
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
index e4fdcb1c592597141c652534911ad833955c4ec2..fbf0eac664f5d6f9a5b56e4674dd2c4ca3b8b040 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
@@ -14,7 +14,7 @@ talc-118:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
index ab2c69c24d8861494d1b63ab35615742ecc64d55..639ecb298122630b80455489158a7108e483f6c1 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
@@ -14,7 +14,7 @@ talc-119:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
index dc52fc8dc02d8b86a1f11ed9c68b434c9f9f75cc..e3dfc7ee4fa9eeb69f12d0baa812feb989f6f32f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
@@ -14,7 +14,7 @@ talc-12:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
index 9e4a9cd8dc5e9528cf9f01c3042ff2037d540d3d..640b69d6df4a6acd2dc6ae9688e778a15211098c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
@@ -10,7 +10,7 @@ talc-120:
       model: Hitachi HDT72103
       rev: A31B
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml
index 766d7c7d3507825f1679dba2ef3c8835e7ee180b..4e313023ee1d2e262b560cb31ea17097073716d5 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-121.yaml
@@ -14,7 +14,7 @@ talc-121:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
index 8ef7c3ed5510c270b61674009e993970c9e792a5..04c961288c45cf141e7c917dcb6e9f4cd8eb3fa0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
@@ -10,7 +10,7 @@ talc-122:
       model: Hitachi HDT72103
       rev: A31B
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
index 5b53d4b035e9470786de0d65cd50c9d19e2d931b..1ec3ad052492b910e4424395fb3c3cea6e1a6df7 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
@@ -14,7 +14,7 @@ talc-123:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
index e33d2d73d1c4d77b7f7bae10ca40291f15d6a69a..5ceeec12114bc645cbacb016228e628253d7f7c3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
@@ -10,7 +10,7 @@ talc-125:
       model: Hitachi HDT72103
       rev: A3AA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
index cc8e70bb0f31e0d6981d4ddb4f00eed4189e3340..6401d6b9a94bd6ce334de31e30832aa1a6749df5 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
@@ -14,7 +14,7 @@ talc-127:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
index 04fbc435dd6ac3595efd032771d048ef2c990083..c18ab1697f7c6b783efcbb153cec87cfa4d28994 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
@@ -14,7 +14,7 @@ talc-128:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
index 45132c04f8706df31628a0fcde1e7dd74df17484..c0a30b1bb58269e6fcf8a572e06b63d6aa348b82 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
@@ -10,7 +10,7 @@ talc-129:
       model: Hitachi HDT72103
       rev: A31B
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml
index c3d5d718e8770b6d63e861cf03fb76127cc32596..cf305e66822e65ee67fcff6dadc731366052f543 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-13.yaml
@@ -14,7 +14,7 @@ talc-13:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
index bc241a114880c0c89d7e48759bb3b5c8c06d2705..43fb592fa33896db5d37bf42deddb94dae2ee13e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
@@ -14,7 +14,7 @@ talc-130:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
index d66283e21dc3b3da33f8228d878400b6b8f760ed..24337719d8bcaaf2b5a0a8f20db0c8347565e9e8 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
@@ -10,7 +10,7 @@ talc-131:
       model: Hitachi HDT72103
       rev: A3AA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
index 46f41bdbfd93a27f62c56c18cd95e1b741d5745d..ad41ba16f5dc98d2d8d91cd9f041b128008ded14 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
@@ -10,7 +10,7 @@ talc-132:
       model: Hitachi HDT72103
       rev: A31B
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
index 31536de132d5cd4e642117d7f5bf825fd195e60f..b849621c122a830ec990634472c279cf86d9e977 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
@@ -14,7 +14,7 @@ talc-134:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml
index f662dea13fd9e4f9fee759bed969b76c4db0d096..36a494c39bd9e08205fbb8568574fcaa31091723 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-14.yaml
@@ -14,7 +14,7 @@ talc-14:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
index edd6379569f21854b06d77ebb7416214955ae5e0..1bee31d66ce1ca5344c67534207e63eba44f74b1 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
@@ -10,7 +10,7 @@ talc-20:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml
index 7c4767b2b719de6c76985f7cc2f26fee60d651f5..094a1347bd437d5052231516b783f10d3b427c15 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-21.yaml
@@ -14,7 +14,7 @@ talc-21:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
index 016d99cec56d55855815f7189851e5f01cd5fe0f..88b03b4bdb0644abf4a215e8e2400096bbec2b7e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
@@ -10,7 +10,7 @@ talc-22:
       model: Hitachi HDS72103
       rev: A39C
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml
index 3959771db6c9e850d89df72c7bb08a4bd7f18bce..64926b294e05d06324d9cc5f093d5412d8613c51 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-23.yaml
@@ -10,7 +10,7 @@ talc-23:
       model: Hitachi HDT72103
       rev: A3AA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
index eded61682e8e56d21559b404d17e2b32cac56dba..0ff8419c05dc71b2764467b60497f9e7df8d7c29 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
@@ -14,7 +14,7 @@ talc-25:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml
index 967372fb4752155c93a3bfb4e46ab12dbe48768f..db41c22b840baa946022b5de0515b0ee631fd398 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-3.yaml
@@ -14,7 +14,7 @@ talc-3:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
index 1f23cee1622ca42f52f9b60cb8fb1d4542f71d0c..dbcf252d1080a61075229218a7b0e9925629359d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
@@ -14,7 +14,7 @@ talc-30:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml
index fee42a1addddeabf93434ad203f1e4a9e83a01b6..5a82500c6eb38fb4e613ef88986da2844b894785 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-32.yaml
@@ -14,7 +14,7 @@ talc-32:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
index 1105270ba1169be94c5db4d7470902fff94db050..47ee945352267e1109edc26246f2bd68fbbb85b9 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
@@ -14,7 +14,7 @@ talc-38:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
index 905b18ee26561d96f7213136344acac2135148f5..943485d3a1c046704632ef6e071fe6855ecb9a48 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
@@ -14,7 +14,7 @@ talc-39:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
index 0844e90c325ed272c4b7c13dfa820b6733245dde..d5cfd81547e19b353a8e485f3ee801b9fffe43ea 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
@@ -14,7 +14,7 @@ talc-40:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
index 2b918323d2b7f23d5545c677458ee86abda320d6..53ebeaa820e9a926232713bdbbf32b0f5cf96d13 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
@@ -14,7 +14,7 @@ talc-41:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
index ef53a89236b5bca474108775d0528a969391c193..93dd44c73cfa6014a36f079c6c8977c7f2813e6f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
@@ -14,7 +14,7 @@ talc-42:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
index 92db4c28c5c5aca53ebfb1a8e8843b95aacec652..b2eceba9223028aac1a29804ed9b9c3b301f139d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
@@ -10,7 +10,7 @@ talc-43:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
index 6045874ad1fb830fd59807e448ff6d5a593db8ba..99f821d4da3f8d3bac44538e7b4444b589380d76 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
@@ -14,7 +14,7 @@ talc-44:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
index 2c47a4a0fe937bfaa17e2f9f95091be19cd1b6e3..9efe9c52f7f1d33c1aa2d1d6923cc9c294b90d8d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
@@ -14,7 +14,7 @@ talc-49:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
index 8e532a520a58529417b152f46c3f2bd3b073a60e..181d3294b0447b585622781bd237b23bad506eed 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
@@ -10,7 +10,7 @@ talc-50:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
index 1eea35dd8b212200f348c61db7e87e656037a67e..6f08b41d8f632d0bf2f670ce3fc82bfea7b13b59 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
@@ -14,7 +14,7 @@ talc-51:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
index fcf0a20d42d4ed51a89220a2222d3cd533f5412c..a9dc5fb30001ebdf550c94a38f28e9eaff616ff1 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
@@ -14,7 +14,7 @@ talc-52:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
index b082129c98f7c5dc059f7cf19d60f3e9934d0a97..db516d4069147f33dec06036b3e88a4ce5856a45 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
@@ -14,7 +14,7 @@ talc-53:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
index 9e211ae87f4ffae65fd090377ae89870332130d2..68aa14c7df7b5e249c59342bca0ce27f8731a78a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
@@ -10,7 +10,7 @@ talc-54:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
index 080b326e4aa77ae1ed11c6d85b443bf5a3c32db5..75d4229662aaa8419082494f5dbafc2b05bd1537 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
@@ -14,7 +14,7 @@ talc-55:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
index 8cdc4b12cd4d5a60ff52c29df95d2c73f45a4b7c..a4df24740c934fb7281384ab2c6f73ae4b3533d8 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
@@ -10,7 +10,7 @@ talc-56:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
index 6e6d8c5dedba27d612b591ab49bae65cd216b215..76e661d9a985e95f16b095656763b8e22e1c2bcd 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
@@ -14,7 +14,7 @@ talc-57:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
index 99ae57f51bbcd578254f3d0944403b924375420b..31be61d2a70ab5f2f1d6c280293705812f790421 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
@@ -10,7 +10,7 @@ talc-58:
       model: Hitachi HDS72103
       rev: A39C
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
index 2196ad8c13da963455546374b5be328fd13d9d32..3dc983d25ded89bdba06b66b4021b7543514860c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
@@ -14,7 +14,7 @@ talc-59:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml
index 5f5b24327e83dcaac752dc21ca8221af71c15d5d..1c33d4a723d99eec8cfd367e8184c35c8c371129 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-6.yaml
@@ -14,7 +14,7 @@ talc-6:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
index 51bd535406a82cced17bf6ebd3e12e8736a33f23..4ca78ef928591345c57510809ee4e8879e432f1e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
@@ -14,7 +14,7 @@ talc-7:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
index f31e6b1233c3ce00c528d4ec3e0dac1f02bd8625..bb69a55426f28620165889c72614e1682e2a3787 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
@@ -10,7 +10,7 @@ talc-75:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
index 86103b001c7f9513b99b17de716450122bb7a1a2..a495d26bfa46b7c83b8d7ce75833f1f6c4f1cb4a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
@@ -14,7 +14,7 @@ talc-76:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
index 6f3b11fef75a8cb2c8bd4cd5f9338716f483fb62..ac2441bf0fa0a34c5a130640e01fbe491e2530be 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
@@ -14,7 +14,7 @@ talc-77:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
index 086b320ed5acf1af17fd29b06ab5b70ff5ff09fa..ea3d9f7b35bde84ec18e8745d1960e0df46288f8 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
@@ -10,7 +10,7 @@ talc-78:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
index 93745cc9c1a9517abb885cdf8193a84e5b38adf8..01bbdb9b69a68980821ab2fe6722030224b8da91 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
@@ -10,7 +10,7 @@ talc-79:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
index 1cd76fc6227cc257b2cd43c05fd14ae460be977f..fa5fb21fc708718e8491d253e8e73fe383667cf7 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
@@ -10,7 +10,7 @@ talc-80:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml
index 08f27180fd33fcb784358a412883237464752bb1..f9aa541b49defeff471659c2e3d89c22f3152dd3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-81.yaml
@@ -10,7 +10,7 @@ talc-81:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
index 7d2e53e6a0b2ae91ddf7cd32f13545b880177332..336fef96b3ebf349a63b4b6a8b2efd3314b5465c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
@@ -14,7 +14,7 @@ talc-82:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
index 11466ba6cfc54160454fe799630d741a4214437e..94138d1b58ad5b5b4add5d8d230831dc9a97c4ee 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
@@ -14,7 +14,7 @@ talc-83:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml
index 2c352a356b5ffc3e81e4c1b4a8045c69cc55a229..aca39067f137a84a734f89d8c7fac2b7466aa0d3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-84.yaml
@@ -14,7 +14,7 @@ talc-84:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
index 23bd6191624d6ad6745cc909d9abeb1f40fcf31c..5efd70451172789c731728e498f70544553f2590 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
@@ -14,7 +14,7 @@ talc-85:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml
index 915035bab1946c17af1586edc619ecbee6a6f27b..8ee395dac4fdebbc75a0a5d5a92e30afb319803d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-86.yaml
@@ -14,7 +14,7 @@ talc-86:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
index 3fbafd6f5d6b9046dadfb7dcb35ff5c075c0fdd9..fab0c16342797964aa42625cdbfb5bf2321d8701 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
@@ -10,7 +10,7 @@ talc-87:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
index 383e15b91d6c72706000ecfdd68ef1686454f953..d106e3cb337cd1b28a008cc260609ba7f9dd646a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
@@ -10,7 +10,7 @@ talc-88:
       model: Hitachi HDT72103
       rev: A3AA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
index 91796ed1f80cfd02eed62cd275af3cf41c71be9c..6fbaf8640cfbf6d5c4590c4319d0f0bc061dea74 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
@@ -10,7 +10,7 @@ talc-89:
       model: Hitachi HDP72503
       rev: A5CA
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml
index 77097448d9b0c961942786f9b5e27bde5a90040a..f1969101218e0ac83fcd1161b119f45a29d10b44 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-9.yaml
@@ -14,7 +14,7 @@ talc-9:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
index 870b85fe31b18f981bdaf29fa27603492624a029..36aa091b2ea5cb181bfca841d6a826353b14ab9d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
@@ -14,7 +14,7 @@ talc-90:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
index 388a60296f8a093460926e238425cee7ffcf2afa..d0b24ede243e2ab81e8ddaec7b9ff8f180426e78 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
@@ -14,7 +14,7 @@ talc-91:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
index ca3b6d51b0fb08395d234dc7836313d9b815ecaf..4fa667fff86a5bfedb9f65132f34daa35fd785d0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
@@ -14,7 +14,7 @@ talc-92:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
index 1d01790c09be8ac0d91a33927171e006fde34674..43433f3dbe08f4b48f59b9cff21a55e977130f13 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
@@ -10,7 +10,7 @@ talc-94:
       model: Hitachi HDT72103
       rev: A31B
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
index 167610231ad9c846e71024681c258ae0e32c600d..8525c8db891159845267302fd6ff6f6066e3ea0a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
@@ -10,7 +10,7 @@ talc-96:
       model: Hitachi HDT72103
       rev: A31B
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
index 8014ba03caec959945bb76f077799a6c9f47021a..96e95ba2233a671549f62a39b5a1aa6f09b0b053 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
@@ -10,7 +10,7 @@ talc-97:
       model: Hitachi HDT72103
       rev: A31B
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   architecture:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
index f4caa975ac0692a3153595449836a9f18f587cf9..7a21b64f94e121a164088bb7d63e70f7ccdea6c2 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
@@ -14,7 +14,7 @@ talc-98:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
index 95dfdcf163b42510aec70d14987a8224205b5ec8..add3f0d52603501ce81362e8fb9462be92bbfc2b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
@@ -14,7 +14,7 @@ talc-99:
     smt_size: 8
     platform_type: x86_64
   operating_system:
-    kernel: 3.2.0-4-amd64
+    kernel: 3.16.0-4-amd64
     version: "8.2"
     name: debian
   processor:
diff --git a/input/grid5000/sites/nancy/clusters/talc/talc.yaml b/input/grid5000/sites/nancy/clusters/talc/talc.yaml
index 392526b21cdd53bed2f2219fed79f484d6154de0..8e0cbc620f5d0a070c54412baab9576c29a3688d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/talc.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/talc.yaml
@@ -9,7 +9,7 @@ nodes:
 # Global node properties
   talc-[1-134]:
     operating_system:
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
       name: debian
       version: '8.2'
     processor:
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome.yaml b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
index 7377f82593f610efab20465194ec94378256cded..d590038a3a80dd59ca2c20c45bdd230146ed116c 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome.yaml
@@ -25,11 +25,15 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml
index eb5a217178da10695321fc1ff2ca0a35608af8aa..0266477acadafcea9a529943663da661ef30884f 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.yaml
@@ -10,9 +10,9 @@ stremi-11:
       size: 250059350016
       rev: HPG2
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     eth0:
       mounted: true
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
index d7300c0ae5eb8c8579e8e74a0b2566b63b6a74dc..54731919339b9b89bff74acc51d60666e77ab6ec 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
@@ -5,9 +5,9 @@ stremi-22:
     release_date: 01/26/2011
     vendor: HP
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: GB0250EAFYK
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
index 970fa06a8c9dd971a4d38c0132832285bbcccb4c..29ddc3ef1f9fe140bea533babcc48e4f918a515e 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
@@ -44,9 +44,9 @@ stremi-30:
       mac: 1c:c1:de:7b:16:fd
       ip: 172.17.160.30
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: GB0250EAFYK
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
index 2354d301b7a3f406eb0db867e24bff358c1ce165..5cfbfdc8d65c70a4a464a0f80f6df84a96312867 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
@@ -49,9 +49,9 @@ stremi-37:
       size: 250059350016
       rev: HPG2
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: amd-v
   chassis:
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
index 3b0d970be6d3d6857a536b9761d28eef8a027d94..321822c0b8cff2cb1e3dbb882fb0c13849bb21bd 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
@@ -44,9 +44,9 @@ stremi-38:
       mac: 1c:c1:de:7a:02:3f
       ip: 172.17.160.38
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: GB0250EAFYK
diff --git a/input/grid5000/sites/reims/clusters/stremi/stremi.yaml b/input/grid5000/sites/reims/clusters/stremi/stremi.yaml
index 74078dade7e010aca2250d8b2d2d0daac0c79262..705258c0c9dc8d3f82c9f163c1a543295647cb9f 100644
--- a/input/grid5000/sites/reims/clusters/stremi/stremi.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/stremi.yaml
@@ -9,9 +9,9 @@ queues:
 nodes:
   stremi-[1-44]:
     operating_system:
-      kernel: 2.6.32-5-amd64
+      kernel: 3.16.0-4-amd64
       name: debian
-      version: 6.0.6
+      version: '8.2'
     processor:
       cache_l1d: 65536
       cache_l1i: 65536
@@ -29,11 +29,15 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      max_walltime: 0
+      queues:
+        - default
+        - admin
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
index 51be7378c5c7c0899ea20989db09dff80c4fb137..21ccb71631d3441044aae2eb13879037bfe32255 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml
@@ -33,7 +33,7 @@ nodes:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
index 3c274bbe27d638d0f1b7e8da7c7e572162e0f680..9759d51a231ba643d83427e1dfa9842637216df9 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
@@ -5,9 +5,9 @@ sol-3:
     release_date: 12/13/2006
     vendor: Sun Microsystems
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: HITACHI HDS7225S
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
index 05939e11b7ff9696a5036ae4119e82050f6abd86..c6fab4d5b73097477c5af7220d357ebd9ad373d5 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
@@ -5,9 +5,9 @@ sol-36:
     release_date: 12/13/2006
     vendor: Sun Microsystems
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: HITACHI HDS7225S
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
index 0671acb7380550107ef1fdc2f939ca4d5f669472..f0d8d7466f4e923bae386bfba2e51ba938a22af1 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
@@ -5,9 +5,9 @@ sol-42:
     release_date: 12/13/2006
     vendor: Sun Microsystems
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: HITACHI HDS7225S
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
index a7dd4276ac6411d3dc5aba04519250c2c669a7c2..8dfcd8abe8be533d94796d288af96ddc85ab1ecb 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
@@ -5,9 +5,9 @@ sol-47:
     release_date: 12/13/2006
     vendor: Sun Microsystems
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: HITACHI HDS7225S
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
index 0e122836cb7292b935b768a597eb51e9de9f9c2e..004597171fb8d42dd5cb91b6bb18dadc1faf7ca5 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
@@ -45,9 +45,9 @@ sol-49:
       mac: 00:16:36:c5:92:7f
       ip: 172.17.129.49
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: amd-v
   chassis:
diff --git a/input/grid5000/sites/sophia/clusters/sol/sol.yaml b/input/grid5000/sites/sophia/clusters/sol/sol.yaml
index d74d05f95a1dbf2942c1d37552532bafc7fd08f3..f9ecc2f639a8392db843ffa004bdbfb330ae8452 100644
--- a/input/grid5000/sites/sophia/clusters/sol/sol.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/sol.yaml
@@ -9,9 +9,9 @@ queues:
 nodes:
   sol-[1-28]:
     operating_system:
-      kernel: 2.6.32-5-amd64
+      kernel: 3.16.0-4-amd64
       name: debian
-      version: 6.0.6
+      version: '8.2'
     processor:
       cache_l1d: 65536
       cache_l1i: 65536
@@ -29,11 +29,15 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      queues:
+        - default
+        - admin
+      max_walltime: 0
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
@@ -108,7 +112,6 @@ nodes:
       wattmeter: false
 
 # Retired nodes
-nodes:
   sol-36:
     status: retired
 
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
index 3a3c8bdc31f9cf736e5c55ee85ff21b77da234fa..b68b79c5ff5660e7f0b02b0befb7523bab136c86 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
@@ -34,9 +34,9 @@ suno-1:
       rev: 1.22
       vendor: Dell
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
index 236f5d62b3379140d6cbc0ae95d31d92b1b5cbd3..4e1b36868a1708bff063f0d86ba1adf4027d7c56 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
@@ -11,9 +11,9 @@ suno-10:
       rev: 1.22
       vendor: Dell
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   network_adapters:
     eth0:
       mounted: true
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
index 657afd0a30e49353e58a520873e9bff3c1018f3f..34364f91ce74c5c0586720eb5f481536c8bd6c66 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
@@ -34,9 +34,9 @@ suno-12:
       mac: 00:26:b9:3f:49:5e
       ip: 172.17.130.12
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   chassis:
     serial: 45JPH4J
     manufacturer: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
index f9ce1f5e1c207d5e1a034b603435c29971626180..d5c91bf5164959de2da6d75641d48ded54438b56 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
@@ -34,9 +34,9 @@ suno-13:
       mac: 00:26:b9:3f:4c:7a
       ip: 172.17.130.13
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   chassis:
     serial: 15JPH4J
     manufacturer: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
index 9bb1fd464aa51337c1f22374dc868c03b573c0f4..4c4cb8089e32457915b505aeb1351f2a25306411 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
@@ -5,9 +5,9 @@ suno-16:
     release_date: 07/29/2009
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: PERC 6/i Adapter
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
index 57c46a23aa466fcbf4ae81605aa642f6c5b3426e..c3dbc0afe6b0b5a0da27faf41346eb606448dcaa 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
@@ -5,9 +5,9 @@ suno-21:
     release_date: 07/29/2009
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: PERC 6/i Adapter
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
index 2b09a15f571688a2b94fd035a75f3891b68d8066..6a511c621e54bd63c0322949b3601ac0b6a2794d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
@@ -28,9 +28,9 @@ suno-25:
       mac: 00:26:b9:3f:47:a4
       ip: 172.17.130.25
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: PERC 6/i Adapter
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
index 7fa87183130108239a725b54de577d584f7be495..644629ca912e6f6d36ce23d91ea5347c5bbda5ec 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
@@ -5,9 +5,9 @@ suno-27:
     release_date: 07/29/2009
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: PERC 6/i Adapter
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
index 8a42ee5767da1fe8c622335a2be0ce3d9ee16845..4475c8a9bcd6e6d5416bf42f2b64b0a5a434817c 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
@@ -28,9 +28,9 @@ suno-29:
       mac: 00:26:b9:3f:47:bc
       ip: 172.17.130.29
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: PERC 6/i Adapter
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
index 1fb289549b528138ae0a9507bb906fb9f206ace1..6a0240e29747acbd2225ce3484e442532430ac06 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
@@ -5,9 +5,9 @@ suno-3:
     release_date: 07/29/2009
     vendor: Dell Inc.
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: PERC 6/i Adapter
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
index ab6a0845706aed088c440caf7f82744db75f9179..b9f9e1b3ad74bb4a7052645d11077d97c400e49d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
@@ -28,9 +28,9 @@ suno-39:
       mac: 00:26:b9:3f:4b:31
       ip: 172.17.130.39
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   storage_devices:
     sda:
       model: PERC 6/i Adapter
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
index fcafe4166219f8977ce55ecad68439318c0b6947..3416cfaf4c912dfaa8377a5663fd5e94425ea84d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
@@ -34,9 +34,9 @@ suno-44:
       rev: 1.22
       vendor: Dell
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   chassis:
     serial: B3JPH4J
     manufacturer: Dell Inc.
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
index 673dcbf2b0ee3c1bbeed7f85aa257b007873c5bd..480bdda00aeca887c4f533c44626c6f28b500c50 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
@@ -34,9 +34,9 @@ suno-5:
       mac: 00:26:b9:3e:e8:5a
       ip: 172.17.130.5
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
index 57cd5fc23fdcaf81ba14323936414c8f89b218a8..d25657722f52f14a32c181995fb657eb2e815194 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
@@ -34,9 +34,9 @@ suno-6:
       rev: 1.22
       vendor: Dell
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
index 73d33fbb0c885da9cd9a775d4cb87008d90d4494..feb5075b8112cc40f183d547e559e1e061aaa22a 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
@@ -34,9 +34,9 @@ suno-9:
       mac: 00:26:b9:3f:41:29
       ip: 172.17.130.9
   operating_system:
-    kernel: 2.6.32-5-amd64
+    kernel: 3.16.0-4-amd64
     name: debian
-    version: 6.0.6
+    version: '8.2'
   supported_job_types:
     virtual: ivt
   chassis:
diff --git a/input/grid5000/sites/sophia/clusters/suno/suno.yaml b/input/grid5000/sites/sophia/clusters/suno/suno.yaml
index 012ae9c02966fd2670c7c13635f25bde308eeb59..a0056a45b656c510fad66583c97a483ab0ea6b4b 100644
--- a/input/grid5000/sites/sophia/clusters/suno/suno.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/suno.yaml
@@ -9,9 +9,9 @@ queues:
 nodes:
   suno-[1-45]:
     operating_system:
-      kernel: 2.6.32-5-amd64
+      kernel: 3.16.0-4-amd64
       name: debian
-      version: 6.0.6
+      version: '8.2'
     processor:
       cache_l1d: 32768
       cache_l1i: 32768
@@ -29,16 +29,20 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
+      queues:
+        - default
+        - admin
+      max_walltime: 0
     operating_system:
       name: debian
       release: Jessie
       version: "8.2"
-      kernel: 3.2.0-4-amd64
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
         driver: megaraid_sas
-        raid: 0
+        raid: '0'
         storage: HDD
         vendor: Dell
     network_adapters: