diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
index b81ded67c80d6f802a54f24c2520854a5f966f0f..b13944c102e5ef4a01fc0c5d3411d36c751c3a2c 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
@@ -386,9 +386,9 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 43200,
     "queues": [
-      "default",
+      "production",
       "admin"
     ],
     "virtual": "ivt"
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
index 42e8edcc7b736392f117ca9315c3afde73b7298d..e744ab925f31a3bd5019739e1b07877aef61bf52 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
@@ -386,9 +386,9 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 43200,
     "queues": [
-      "default",
+      "production",
       "admin"
     ],
     "virtual": "ivt"
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
index bc4b88e34cc6b081791935aac62360ca1b02e84a..84c41d2de995a1a3646b9c39ba20d163ba37459d 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
@@ -386,9 +386,9 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 43200,
     "queues": [
-      "default",
+      "production",
       "admin"
     ],
     "virtual": "ivt"
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
index 78c8a0031d3c1c196c1b24459fd7da0a0208c5ad..8488d0a0fbd9367e26c7ffe6b06d33cb8105fc71 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
@@ -386,9 +386,9 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 43200,
     "queues": [
-      "default",
+      "production",
       "admin"
     ],
     "virtual": "ivt"
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
index d2fdd5d4498a797022dc20d7242d50f3a82ba19b..3fee4e4a26725a160895790aa013db9100123d98 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
@@ -386,9 +386,9 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
-      "default",
+      "production",
       "admin"
     ],
     "virtual": "ivt"
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
index 55fcbba63ddee256baff51c1a88312b8ddb19b66..788257258665d4ab18b1d04f7fdddd4db46651ee 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
@@ -386,9 +386,9 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
-      "default",
+      "production",
       "admin"
     ],
     "virtual": "ivt"
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
index fa2835c2dce09bf7f2cc9eab74913e31e4d390bc..be332860de98c09ee0901a7ded26e1520c0628d9 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
@@ -386,9 +386,9 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
-      "default",
+      "production",
       "admin"
     ],
     "virtual": "ivt"
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json b/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json
index c0ace49fde8fd14e86c2b737693f6d73c19c68ea..f190cad99f33b6b7a4971dc69582c147c3a7c770 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json
@@ -316,7 +316,7 @@
   ],
   "model": "Dell PowerEdge C6220 II",
   "queues": [
-    "default",
+    "production",
     "admin"
   ],
   "type": "cluster",
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
index f04abc94b6d4a79b0de361d0727a11aef9884e03..9afcfea667d7faf7cb79f4f7f1ac8f1a4e5b3cba 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml
@@ -4,7 +4,7 @@ created_at: 2014-02-21
 kavlan: true
 boot_type: bios
 queues:
-  - default
+  - production
   - admin
 
 nodes:
@@ -23,7 +23,6 @@ nodes:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 0
     storage_devices:
       pci-0000:82:00.0-sas-phy0-lun-0:
         interface: SAS
@@ -67,3 +66,9 @@ nodes:
         enabled: true
         mounted: false
         mountable: false
+  paranoia-[1-4]:
+    supported_job_types:
+      max_walltime: 43200
+  paranoia-[5-8]:
+    supported_job_types:
+      max_walltime: 604800