diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 7270ed0a5b9c88a7a42be2554317d1b910ed54fe..d57ef83d7d841fe6bd48f9f8ae82f1519873e47f 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -1781,6 +1781,61 @@
       ]
     }
   },
+  "esterel22": {
+    "besteffort": {
+      "ggas": [
+        "cidre",
+        "kerdata",
+        "magellan",
+        "myriads",
+        "pacap",
+        "wide",
+        "pirat",
+        "coast",
+        "avalon",
+        "chroma",
+        "emeraude",
+        "maracas",
+        "inria-chile",
+        "inria-dsi",
+        "inria-sidf",
+        "swh",
+        "tadaam"
+      ],
+      "sites": [
+        "mc-rennes",
+        "mc-nancy",
+        "mc-lyon",
+        "mc-economic-activity",
+        "mc-sophia",
+        "mc-lille",
+        "mc-grenoble",
+        "mc-paris",
+        "mc-saclay",
+        "mc-bordeaux",
+        "mc-siege",
+        "mc-guest",
+        "slices-fr-grenoble",
+        "slices-fr-lille",
+        "slices-fr-lyon",
+        "slices-fr-nancy",
+        "slices-fr-nantes",
+        "slices-fr-rennes",
+        "slices-fr-sophia",
+        "slices-fr-strasbourg",
+        "slices-fr-toulouse"
+      ]
+    },
+    "p1": {
+      "ggas": [
+        "graphdeco"
+      ],
+      "sites": [
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    }
+  },
   "esterel24": {
     "besteffort": {
       "ggas": [
diff --git a/data/grid5000/sites/sophia/clusters/esterel22/esterel22.json b/data/grid5000/sites/sophia/clusters/esterel22/esterel22.json
index af32d53411c969905423b3a5c555f9f5c32b33f8..eeeeaca186681176f17cd12946f03a53b238f6fa 100644
--- a/data/grid5000/sites/sophia/clusters/esterel22/esterel22.json
+++ b/data/grid5000/sites/sophia/clusters/esterel22/esterel22.json
@@ -67,7 +67,7 @@
   "priority": 202010,
   "queues": [
     "admin",
-    "testing"
+    "production"
   ],
   "redfish": true,
   "type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json b/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json
index 2ab81f9d2da336a6bb615bdb409ecb02d92ba6d4..02e303710a6b78c5091d393717a615b30e13d22b 100644
--- a/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json
@@ -297,10 +297,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
diff --git a/input/grid5000/access/sophia.yaml b/input/grid5000/access/sophia.yaml
index 16ed799adc41a8725cc1dea59c42153021a55a82..5662f8eaa024045fa6a10045ae09fb611bf30f2d 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -30,6 +30,7 @@ esterel3: &dedicated-graphdeco
     besteffort: ['@inria_group', '@other_groups_with_access']
 esterel6: *dedicated-graphdeco
 esterel24: *dedicated-graphdeco
+esterel22: *dedicated-graphdeco
 
 esterel5: &dedicated-stars
     p1: [stars, '@admin']
diff --git a/input/grid5000/sites/sophia/clusters/esterel22/esterel22.yaml b/input/grid5000/sites/sophia/clusters/esterel22/esterel22.yaml
index 991cb6b58585b2b37382f9e4e3e95840d035c6eb..9cb90e54ab97e0e3b0fac88b09881cdd78c67b2b 100644
--- a/input/grid5000/sites/sophia/clusters/esterel22/esterel22.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel22/esterel22.yaml
@@ -6,13 +6,13 @@ boot_type: uefi
 exotic: false
 queues:
   - admin
-  - testing
+  - production
 nodes:
   esterel22-1:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 0
+      max_walltime: 604800
     processor:
       microarchitecture: Cascade Lake-SP
       clock_speed: 2600000000