diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 85330e87c03fed32d23fc9f3e0683bb31bf385d4..70f2027c6f021c21ce5445005c496be61f66e56f 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -2057,6 +2057,61 @@
       ]
     }
   },
+  "esterel33": {
+    "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": [
+        "neo"
+      ],
+      "sites": [
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    }
+  },
   "esterel4": {
     "besteffort": {
       "ggas": [
diff --git a/data/grid5000/sites/sophia/clusters/esterel33/esterel33.json b/data/grid5000/sites/sophia/clusters/esterel33/esterel33.json
index 3a10268209813c809ba6e1ad0da83ad307c4edb7..8c374f9604d17d59da32905c1b51573fcce7b974 100644
--- a/data/grid5000/sites/sophia/clusters/esterel33/esterel33.json
+++ b/data/grid5000/sites/sophia/clusters/esterel33/esterel33.json
@@ -84,7 +84,7 @@
   "priority": 202205,
   "queues": [
     "admin",
-    "testing"
+    "production"
   ],
   "redfish": true,
   "type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/esterel33/nodes/esterel33-1.json b/data/grid5000/sites/sophia/clusters/esterel33/nodes/esterel33-1.json
index 87c676750f7ca22c02c2dde504fb5af3254d77e1..dd717698e09fbdabf790c8f0a05944f5494f1f98 100644
--- a/data/grid5000/sites/sophia/clusters/esterel33/nodes/esterel33-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel33/nodes/esterel33-1.json
@@ -300,10 +300,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "amd-v"
   },
diff --git a/input/grid5000/access/sophia.yaml b/input/grid5000/access/sophia.yaml
index 34a3c38ea451b6baf6c13fdd8c961768c9131380..a879272ceb72227b11704c3ef306c28d8b99abd0 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -45,6 +45,10 @@ esterel32: &dedicated-i3s-sparks
     p1: [i3s, sparks, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
 
+esterel33: &dedicated-neo
+    p1: [neo, '@admin']
+    besteffort: ['@inria_group', '@other_groups_with_access']
+
 esterel12: &dedicated-titane
     p1: [titane, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
diff --git a/input/grid5000/sites/sophia/clusters/esterel33/esterel33.yaml b/input/grid5000/sites/sophia/clusters/esterel33/esterel33.yaml
index 34b86f03e8becf794c360984c36a9df1298a8365..318b825d5e2eb72e69a20f890d38e37830631f5b 100644
--- a/input/grid5000/sites/sophia/clusters/esterel33/esterel33.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel33/esterel33.yaml
@@ -6,13 +6,13 @@ boot_type: bios
 exotic: false
 queues:
   - admin
-  - testing
+  - production
 nodes:
   esterel33-1:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 0
+      max_walltime: 604800
     processor:
       microarchitecture: Zen 2
       clock_speed: 2_800_000_000