diff --git a/web/crux-ui/e2e/with-login/deployment/deployment-copyability-versioned.spec.ts b/web/crux-ui/e2e/with-login/deployment/deployment-copyability-versioned.spec.ts
index 0ea08dab0..288e91280 100644
--- a/web/crux-ui/e2e/with-login/deployment/deployment-copyability-versioned.spec.ts
+++ b/web/crux-ui/e2e/with-login/deployment/deployment-copyability-versioned.spec.ts
@@ -100,6 +100,7 @@ test.describe('Versioned Project', () => {
     await page.waitForSelector('h2:text-is("Deployments")')
 
     await page.getByPlaceholder('Search').fill(prefix)
+    await expect(page.locator('table.w-full >> tbody >> tr')).toHaveCount(1)
 
     const copyButton = await page.locator(`[alt="Copy"]:right-of(:has-text("${projectName}"))`).first()
     await copyButton.click()
diff --git a/web/crux-ui/e2e/with-login/deployment/deployment-copyability-versionless.spec.ts b/web/crux-ui/e2e/with-login/deployment/deployment-copyability-versionless.spec.ts
index 3d0aaaeae..5543ce139 100644
--- a/web/crux-ui/e2e/with-login/deployment/deployment-copyability-versionless.spec.ts
+++ b/web/crux-ui/e2e/with-login/deployment/deployment-copyability-versionless.spec.ts
@@ -39,6 +39,7 @@ test.describe('Versionless Project', () => {
     await page.waitForSelector('h2:text-is("Deployments")')
 
     await page.getByPlaceholder('Search').fill(prefix)
+    await expect(page.locator('table.w-full >> tbody >> tr')).toHaveCount(1)
 
     const copyButton = await page.locator(`[alt="Copy"]:right-of(:has-text("${projectName}"))`).first()
     await copyButton.click()
diff --git a/web/crux-ui/e2e/with-login/deployment/deployment-deletability.spec.ts b/web/crux-ui/e2e/with-login/deployment/deployment-deletability.spec.ts
index 8cc033c15..9948b8fe2 100644
--- a/web/crux-ui/e2e/with-login/deployment/deployment-deletability.spec.ts
+++ b/web/crux-ui/e2e/with-login/deployment/deployment-deletability.spec.ts
@@ -90,6 +90,7 @@ test('Deleting a deployment should refresh deployment list', async ({ page }) =>
   await page.waitForSelector('h2:text-is("Deployments")')
 
   await page.getByPlaceholder('Search').fill(projectName)
+  await expect(page.locator('table.w-full >> tbody >> tr')).toHaveCount(2)
 
   await deleteRefreshDeployment()
   await expect(page.locator(`.p-2:has-text('pw-${projectName}')`)).toHaveCount(1)
diff --git a/web/crux-ui/e2e/with-login/deployment/deployment-protection.spec.ts b/web/crux-ui/e2e/with-login/deployment/deployment-protection.spec.ts
index 8aef03d8a..ad7b4e52f 100644
--- a/web/crux-ui/e2e/with-login/deployment/deployment-protection.spec.ts
+++ b/web/crux-ui/e2e/with-login/deployment/deployment-protection.spec.ts
@@ -31,9 +31,9 @@ test('Protecting a deployment should fail while an incremental protected deploym
   await page.click('button:text-is("Deployments")')
 
   const deploymentsRows = await page.locator('table.w-full >> tbody >> tr')
-  await expect(deploymentsRows).toHaveCount(1)
+  await expect(deploymentsRows).not.toBeEmpty()
+  await deploymentsRows.locator(`td:has-text("${PREFIX}")`).click()
 
-  await deploymentsRows.first().click()
   await page.waitForURL(`${TEAM_ROUTES.deployment.list()}/**`)
   await page.waitForSelector('h2:text-is("Deployments")')
   const editDeploymentId = page.url().split('/').pop()