diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
index b8d0340fb0f0456564ac47b20d55fd50500577fa..33c1934a7068087198f466f9230ec12444c1f35c 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
@@ -200,7 +200,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 86400,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
index cc6aafaa486e4c80ae763f42ff888ec7b0960d2b..7039cf4b839c1624d70a5e02f2c0efe0c7bf4da0 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
@@ -200,7 +200,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 172800,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
index 1a038ab8d737b96fcb4a3ecea252a56e617566a8..6368e0b697377952b1be5fc4129f96aa564c43e6 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
@@ -200,7 +200,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
       "production"
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
index b36cf8e43cdfdc805f972d2bd04845f979e2fdeb..06860e3cc79a6091eb8d9275500632da0b8a9b34 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
@@ -200,7 +200,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
       "production"
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
index 0081a439b07b77a5d10c769d3f8db217699a89b0..c0aa60e1b112332d51f687aeb1d58e4341e1a148 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
@@ -10,19 +10,17 @@ queues:
 nodes:
   chartreuse2-1:
     supported_job_types:
-      deploy: true
-      besteffort: true
       max_walltime: 86400
   chartreuse2-2:
     supported_job_types:
-      deploy: true
-      besteffort: true
       max_walltime: 172800
   chartreuse2-[3-4]:
+    supported_job_types:
+      max_walltime: 604800
+  chartreuse2-[1-4]:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 604800
     processor:
       microarchitecture: Broadwell 
       clock_speed: 2400000000