diff --git a/tests/e2e/journeys/upgrade-free-tier.spec.ts b/tests/e2e/journeys/upgrade-free-tier.spec.ts
index e102e1d0d..f13adb4fa 100644
--- a/tests/e2e/journeys/upgrade-free-tier.spec.ts
+++ b/tests/e2e/journeys/upgrade-free-tier.spec.ts
@@ -8,7 +8,7 @@ test('upgrade - free tier', async ({ page }) => {
     await createFreeProject(page);
     await test.step('upgrade project', async () => {
         await page.getByRole('link', { name: 'Upgrade', exact: true }).click();
-        await page.waitForURL('./organization-**/change-plan');
+        await page.waitForURL(/\/organization-[^/]+\/change-plan/);
         await page.locator('input[value="tier-1"]').click();
         await page.getByRole('button', { name: 'add' }).first().click();
         await enterCreditCard(page);
diff --git a/tests/e2e/steps/free-project.ts b/tests/e2e/steps/free-project.ts
index 2cd90932f..8f8c775ed 100644
--- a/tests/e2e/steps/free-project.ts
+++ b/tests/e2e/steps/free-project.ts
@@ -13,12 +13,12 @@ export async function createFreeProject(page: Page): Promise<Metadata> {
         await page.locator('id=name').fill('test org');
         await page.locator('id=plan').selectOption('tier-0');
         await page.getByRole('button', { name: 'get started' }).click();
-        await page.waitForURL('./organization-**');
+        await page.waitForURL(/\/organization-[^/]+/);
         return getOrganizationIdFromUrl(page.url());
     });
 
     const projectId = await test.step('create project', async () => {
-        await page.waitForURL('./organization-**');
+        await page.waitForURL(/\/organization-[^/]+/);
         await page.getByRole('button', { name: 'create project' }).first().click();
         await page.locator('id=name').fill('test project');
         await page.getByRole('button', { name: 'next' }).click();
diff --git a/tests/e2e/steps/pro-project.ts b/tests/e2e/steps/pro-project.ts
index 4b6028a33..fa42b2299 100644
--- a/tests/e2e/steps/pro-project.ts
+++ b/tests/e2e/steps/pro-project.ts
@@ -32,18 +32,18 @@ export async function createProProject(page: Page): Promise<Metadata> {
         await page.locator('id=name').fill('test org');
         await page.locator('id=plan').selectOption('tier-1');
         await page.getByRole('button', { name: 'get started' }).click();
-        await page.waitForURL('./create-organization**');
+        await page.waitForURL(/\/create-organization.*/);
         await page.getByRole('button', { name: 'add' }).first().click();
         await enterCreditCard(page);
         // skip members
         await page.getByRole('button', { name: 'create organization' }).click();
-        await page.waitForURL('./organization-**');
+        await page.waitForURL(/\/organization-[^/]+/);
 
         return getOrganizationIdFromUrl(page.url());
     });
 
     const projectId = await test.step('create project', async () => {
-        await page.waitForURL('./organization-**');
+        await page.waitForURL(/\/organization-[^/]+/);
         await page.getByRole('button', { name: 'create project' }).first().click();
         await page.getByPlaceholder('project name').fill('test project');
         await page.getByRole('button', { name: 'next' }).click();