diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 65a78032252d0e83c41278bf3542794811296604..7a7a41836663b0b1427577ed2ffff9983899b556 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -1561,6 +1561,61 @@
       ]
     }
   },
+  "esterel2": {
+    "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": [
+        "epione"
+      ],
+      "sites": [
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    }
+  },
   "esterel41": {
     "besteffort": {
       "ggas": [
diff --git a/data/grid5000/sites/sophia/clusters/esterel2/esterel2.json b/data/grid5000/sites/sophia/clusters/esterel2/esterel2.json
index 9193db03e58048e4bafc427ba3e7197aca3bc3a3..267f8afb44ca014cc19284759dea55225c16c069 100644
--- a/data/grid5000/sites/sophia/clusters/esterel2/esterel2.json
+++ b/data/grid5000/sites/sophia/clusters/esterel2/esterel2.json
@@ -84,7 +84,7 @@
   "priority": 201705,
   "queues": [
     "admin",
-    "testing"
+    "production"
   ],
   "redfish": true,
   "type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json b/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
index 9b1559709e2c8449c5b771f9ee265d3adae75408..96910a7c0b6685844278e90948a359673bbfc7e0 100644
--- a/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
@@ -306,10 +306,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 aa1c56f528a199055b1907cba38114fd10da667a..06a5ac50c24dd93d32811accf977d7de10778b71 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -17,6 +17,10 @@ esterel10: *inria-sophia
 mercantour5: *inria-sophia
 
 # DEDICATED MODE
+esterel2: &dedicated-epione
+    p1: [epione, '@admin']
+    besteffort: ['@inria_group', '@other_groups_with_access']
+
 esterel5: &dedicated-stars
     p1: [stars, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
diff --git a/input/grid5000/sites/sophia/clusters/esterel2/esterel2.yaml b/input/grid5000/sites/sophia/clusters/esterel2/esterel2.yaml
index 4934ebfa3a7cf74a500d2327f6a469fbbf40d8f1..95022fb31a0cdf2aaefbc1582ee87294bd2d065f 100644
--- a/input/grid5000/sites/sophia/clusters/esterel2/esterel2.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel2/esterel2.yaml
@@ -6,13 +6,13 @@ boot_type: bios
 exotic: false
 queues:
   - admin
-  - testing
+  - production
 nodes:
   esterel2-1:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 0
+      max_walltime: 604800
     processor:
       microarchitecture: Haswell
       clock_speed: 2_400_000_000