diff --git a/docker/auth/realm.json b/docker/auth/realm.json
index 03fbbb9..4af531b 100644
--- a/docker/auth/realm.json
+++ b/docker/auth/realm.json
@@ -80,7 +80,7 @@
     },
     {
       "username": "user-e2e-chromium",
-      "email": "user@chromium.e2e",
+      "email": "user-e2e-chromium@example.org",
       "firstName": "E2E",
       "lastName": "Chromium",
       "enabled": true,
@@ -97,7 +97,7 @@
     },
     {
       "username": "user-e2e-webkit",
-      "email": "user@webkit.e2e",
+      "email": "user-e2e-webkit@example.org",
       "firstName": "E2E",
       "lastName": "Webkit",
       "enabled": true,
@@ -114,7 +114,7 @@
     },
     {
       "username": "user-e2e-firefox",
-      "email": "user@firefox.e2e",
+      "email": "user-e2e-firefox@example.org",
       "firstName": "E2E",
       "lastName": "Firefox",
       "enabled": true,
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/common.ts b/src/frontend/apps/e2e/__tests__/app-desk/common.ts
index 3917c2d..2535c14 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/common.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/common.ts
@@ -18,6 +18,7 @@ export const keyCloakSignIn = async (
     ? `password-e2e.${accountName}`
     : `password-e2e-${browserName}`;
 
+  await page.waitForURL('http://localhost:8083/**');
   if (title?.includes('Sign in to your account')) {
     await page.getByRole('textbox', { name: 'username' }).fill(username);
 
@@ -25,6 +26,7 @@ export const keyCloakSignIn = async (
 
     await page.click('input[type="submit"]', { force: true });
   }
+  await page.waitForURL('http://localhost:3000/**');
 };
 
 export const randomName = (name: string, browserName: string, length: number) =>
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/member-grid.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/member-grid.spec.ts
index 6a668b0..4b6af6e 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/member-grid.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/member-grid.spec.ts
@@ -26,7 +26,9 @@ test.describe('Member Grid', () => {
     await expect(cells.nth(1)).toHaveText(
       new RegExp(`E2E ${browserName}`, 'i'),
     );
-    await expect(cells.nth(2)).toHaveText(`user@${browserName}.e2e`);
+    await expect(cells.nth(2)).toHaveText(
+      `user-e2e-${browserName}@example.org`,
+    );
     await expect(cells.nth(3)).toHaveText(/Owner/i);
   });
 
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/menu.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/menu.spec.ts
index f9ee991..b5a9125 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/menu.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/menu.spec.ts
@@ -69,7 +69,7 @@ test.describe('Menu', () => {
       await route.fulfill({
         json: {
           id: '52de4dcf-5ca0-4b7f-9841-3a18e8cb6a95',
-          email: 'user@chromium.e2e',
+          email: 'user-e2e-chromium@example.com',
           language: 'en-us',
           name: 'E2E Chromium',
           timezone: 'UTC',
@@ -115,7 +115,7 @@ test.describe('Menu', () => {
       await route.fulfill({
         json: {
           id: '52de4dcf-5ca0-4b7f-9841-3a18e8cb6a95',
-          email: 'user@chromium.e2e',
+          email: 'user-e2e-chromium@example.com',
           language: 'en-us',
           name: 'E2E ChromiumMM',
           timezone: 'UTC',