diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index bb63efe3a84a542ff51845bcb9af71cbb2d18ce9..7dd4a6decda5ec2c1c2f5ffbec7615e0cccab292 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -2182,6 +2182,62 @@
       ]
     }
   },
+  "esterel31": {
+    "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": [
+        "i3s",
+        "sparks"
+      ],
+      "sites": [
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    }
+  },
   "esterel32": {
     "besteffort": {
       "ggas": [
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json b/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json
index 6c7c3c26af767084bf9e9b0c8c488884c9b33bb0..ba00ab1294fd8fb05708691a4ccb322cb8e03799 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json
@@ -145,7 +145,7 @@
   "priority": 202108,
   "queues": [
     "admin",
-    "testing"
+    "production"
   ],
   "redfish": true,
   "type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
index cb7226d94668659e982b0703b14157614aff9b15..39df31e0c95a398c2ee35a9bad8042b995451944 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
@@ -314,10 +314,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
index d3df2e4111ab4560e4b2d6b3e5cf16062b6bf676..f22d723f69cfe00a0402bc36600fb3b49739bef5 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
@@ -314,10 +314,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
index 487e1362f5488952962093df385c90d2ffd88152..db3a603b3094ba299920ad3660cfe638e5c24ed6 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
@@ -314,10 +314,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
index 44f84dbbee2ba45a341b74b869cbec810f39975b..4313decf64966c4359a2e83d1954e88bfcc20d95 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
@@ -314,10 +314,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 aba1dd97c33d6cf719f80d6edb0d7ffe540f3255..6e5976618283de0d6d47a45c0efdd02ff648043b 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -48,6 +48,8 @@ esterel32: &dedicated-i3s-sparks
     p1: [i3s, sparks, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
 
+esterel31: *dedicated-i3s-sparks
+
 esterel33: &dedicated-neo
     p1: [neo, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
diff --git a/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml b/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml
index f5d13e8b75814ca881f2029ec882bd63e84bf13d..b60713f3b983c9576e6056d489e0f79df081494c 100644
--- a/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml
@@ -6,13 +6,13 @@ boot_type: bios
 exotic: false
 queues:
   - admin
-  - testing
+  - production
 nodes:
   esterel31-[1-4]:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 0
+      max_walltime: 604800
     processor:
       microarchitecture: Cascade Lake-SP
       clock_speed: 2_100_000_000