diff --git a/docker/auth/realm.json b/docker/auth/realm.json
index cee70d21..db5f1be0 100644
--- a/docker/auth/realm.json
+++ b/docker/auth/realm.json
@@ -60,7 +60,7 @@
     },
     {
       "username": "user-e2e-chromium",
-      "email": "user@chromium.e2e",
+      "email": "user@chromium.test",
       "firstName": "E2E",
       "lastName": "Chromium",
       "enabled": true,
@@ -74,7 +74,7 @@
     },
     {
       "username": "user-e2e-webkit",
-      "email": "user@webkit.e2e",
+      "email": "user@webkit.test",
       "firstName": "E2E",
       "lastName": "Webkit",
       "enabled": true,
@@ -88,7 +88,7 @@
     },
     {
       "username": "user-e2e-firefox",
-      "email": "user@firefox.e2e",
+      "email": "user@firefox.test",
       "firstName": "E2E",
       "lastName": "Firefox",
       "enabled": true,
diff --git a/docs/examples/keycloak.values.yaml b/docs/examples/keycloak.values.yaml
index 0e9ae57b..faa2f78f 100644
--- a/docs/examples/keycloak.values.yaml
+++ b/docs/examples/keycloak.values.yaml
@@ -91,7 +91,7 @@ extraDeploy:
           },
           {
             "username": "user-e2e-chromium",
-            "email": "user@chromium.e2e",
+            "email": "user@chromium.test",
             "firstName": "E2E",
             "lastName": "Chromium",
             "enabled": "true",
@@ -105,7 +105,7 @@ extraDeploy:
           },
           {
             "username": "user-e2e-webkit",
-            "email": "user@webkit.e2e",
+            "email": "user@webkit.test",
             "firstName": "E2E",
             "lastName": "Webkit",
             "enabled": "true",
@@ -119,7 +119,7 @@ extraDeploy:
           },
           {
             "username": "user-e2e-firefox",
-            "email": "user@firefox.e2e",
+            "email": "user@firefox.test",
             "firstName": "E2E",
             "lastName": "Firefox",
             "enabled": "true",
diff --git a/src/backend/demo/defaults.py b/src/backend/demo/defaults.py
index 4b082e39..ee82235d 100644
--- a/src/backend/demo/defaults.py
+++ b/src/backend/demo/defaults.py
@@ -8,11 +8,11 @@ NB_OBJECTS = {
 
 DEV_USERS = [
     {"username": "impress", "email": "impress@impress.world", "language": "en-us"},
-    {"username": "user-e2e-webkit", "email": "user@webkit.e2e", "language": "en-us"},
-    {"username": "user-e2e-firefox", "email": "user@firefox.e2e", "language": "en-us"},
+    {"username": "user-e2e-webkit", "email": "user@webkit.test", "language": "en-us"},
+    {"username": "user-e2e-firefox", "email": "user@firefox.test", "language": "en-us"},
     {
         "username": "user-e2e-chromium",
-        "email": "user@chromium.e2e",
+        "email": "user@chromium.test",
         "language": "en-us",
     },
 ]
diff --git a/src/backend/demo/tests/test_commands_create_demo.py b/src/backend/demo/tests/test_commands_create_demo.py
index fef8a488..b997f904 100644
--- a/src/backend/demo/tests/test_commands_create_demo.py
+++ b/src/backend/demo/tests/test_commands_create_demo.py
@@ -33,9 +33,9 @@ def test_commands_create_demo():
     # assert dev users have doc accesses
     user = models.User.objects.get(email="impress@impress.world")
     assert models.DocumentAccess.objects.filter(user=user).exists()
-    user = models.User.objects.get(email="user@webkit.e2e")
+    user = models.User.objects.get(email="user@webkit.test")
     assert models.DocumentAccess.objects.filter(user=user).exists()
-    user = models.User.objects.get(email="user@firefox.e2e")
+    user = models.User.objects.get(email="user@firefox.test")
     assert models.DocumentAccess.objects.filter(user=user).exists()
-    user = models.User.objects.get(email="user@chromium.e2e")
+    user = models.User.objects.get(email="user@chromium.test")
     assert models.DocumentAccess.objects.filter(user=user).exists()
diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-create.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-create.spec.ts
index 811d64bb..8742dd87 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-create.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-create.spec.ts
@@ -44,8 +44,8 @@ test.describe('Doc Create: Not logged', () => {
     const data = {
       title,
       content: markdown,
-      sub: `user@${browserName}.e2e`,
-      email: `user@${browserName}.e2e`,
+      sub: `user@${browserName}.test`,
+      email: `user@${browserName}.test`,
     };
 
     const newDoc = await request.post(
diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-member-list.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-member-list.spec.ts
index 45f68b78..3a134b86 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-member-list.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-member-list.spec.ts
@@ -131,7 +131,7 @@ test.describe('Document list members', () => {
     const list = page.getByTestId('doc-share-quick-search');
     await expect(list).toBeVisible();
     const currentUser = list.getByTestId(
-      `doc-share-member-row-user@${browserName}.e2e`,
+      `doc-share-member-row-user@${browserName}.test`,
     );
     const currentUserRole = currentUser.getByLabel('doc-role-dropdown');
     await expect(currentUser).toBeVisible();
@@ -175,7 +175,7 @@ test.describe('Document list members', () => {
 
     const list = page.getByTestId('doc-share-quick-search');
 
-    const emailMyself = `user@${browserName}.e2e`;
+    const emailMyself = `user@${browserName}.test`;
     const mySelf = list.getByTestId(`doc-share-member-row-${emailMyself}`);
     const mySelfMoreActions = mySelf.getByRole('button', {
       name: 'more_horiz',
diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-visibility.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-visibility.spec.ts
index 2c0f3506..e4191f0b 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-visibility.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-visibility.spec.ts
@@ -151,7 +151,7 @@ test.describe('Doc Visibility: Restricted', () => {
     });
 
     const otherBrowser = browsersName.find((b) => b !== browserName);
-    const username = `user@${otherBrowser}.e2e`;
+    const username = `user@${otherBrowser}.test`;
     await inputSearch.fill(username);
     await page.getByRole('option', { name: username }).click();