diff --git a/playwright/e2e/oidc/index.ts b/playwright/e2e/oidc/index.ts
index ebcf395d47..1dcae1c21d 100644
--- a/playwright/e2e/oidc/index.ts
+++ b/playwright/e2e/oidc/index.ts
@@ -29,7 +29,9 @@ export async function registerAccountMas(
 
     let code: string;
     await expect(async () => {
-        const text = await mailpit.renderMessageText();
+        const messages = await mailpit.listMessages();
+        expect(messages.messages[0].To[0].Address).toEqual(email);
+        const text = await mailpit.renderMessageText(messages.messages[0].ID);
         [, code] = text.match(/Your verification code to confirm this email address is: (\d{6})/);
     }).toPass();
 
diff --git a/playwright/e2e/register/email.spec.ts b/playwright/e2e/register/email.spec.ts
index 5ef45ec8fd..d351893f8b 100644
--- a/playwright/e2e/register/email.spec.ts
+++ b/playwright/e2e/register/email.spec.ts
@@ -51,9 +51,11 @@ test.describe("Email Registration", async () => {
 
             await expect(page.getByText("An error was encountered when sending the email")).not.toBeVisible();
 
-            const { Links: links } = await mailpitClient.linkCheck();
-            expect(links).toHaveLength(1);
-            const emailLink = links[0].URL;
+            const messages = await mailpitClient.listMessages();
+            expect(messages.messages).toHaveLength(1);
+            expect(messages.messages[0].To[0].Address).toEqual("alice@email.com");
+            const text = await mailpitClient.renderMessageText(messages.messages[0].ID);
+            const [emailLink] = text.match(/http.+/);
             await request.get(emailLink); // "Click" the link in the email
 
             await expect(page.getByText("Welcome alice")).toBeVisible();
diff --git a/playwright/testcontainers/mailpit.ts b/playwright/testcontainers/mailpit.ts
index 94fbb42c83..c4c025c05c 100644
--- a/playwright/testcontainers/mailpit.ts
+++ b/playwright/testcontainers/mailpit.ts
@@ -12,7 +12,10 @@ export class MailhogContainer extends GenericContainer {
     constructor() {
         super("axllent/mailpit:latest");
 
-        this.withExposedPorts(8025).withWaitStrategy(Wait.forListeningPorts());
+        this.withExposedPorts(8025).withWaitStrategy(Wait.forListeningPorts()).withEnvironment({
+            MP_SMTP_AUTH_ALLOW_INSECURE: "true",
+            MP_SMTP_AUTH_ACCEPT_ANY: "true",
+        });
     }
 
     public override async start(): Promise<StartedMailhogContainer> {