diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permission.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permission.spec.ts
index f93edc2e2e2..dff19145d0d 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permission.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permission.spec.ts
@@ -138,7 +138,9 @@ test.afterAll(async ({ browser }) => {
   const { apiContext, afterAction } = await performAdminLogin(browser);
   await user.delete(apiContext);
   await role.delete(apiContext);
+  await role2.delete(apiContext);
   await policy.delete(apiContext);
+  await policy2.delete(apiContext);
   await table.delete(apiContext);
   await afterAction();
 });
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permissions/DomainPermissions.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permissions/DomainPermissions.spec.ts
index 41dc497a11a..2afc7460b4a 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permissions/DomainPermissions.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permissions/DomainPermissions.spec.ts
@@ -17,10 +17,11 @@ import { Domain } from '../../../support/domain/Domain';
 import { EntityDataClass } from '../../../support/entity/EntityDataClass';
 import { UserClass } from '../../../support/user/UserClass';
 import { performAdminLogin } from '../../../utils/admin';
-import { redirectToHomePage, uuid } from '../../../utils/common';
+import { getApiContext, redirectToHomePage, uuid } from '../../../utils/common';
 import { addCustomPropertiesForEntity } from '../../../utils/customProperty';
 import {
   assignRoleToUser,
+  cleanupPermissions,
   initializePermissions,
 } from '../../../utils/permission';
 import {
@@ -93,6 +94,7 @@ test('Domain allow operations', async ({ testUserPage, browser }) => {
   // Setup allow permissions
   const page = await browser.newPage();
   await adminUser.login(page);
+  const { apiContext } = await getApiContext(page);
   await initializePermissions(page, 'allow', [
     'EditDescription',
     'EditOwners',
@@ -156,6 +158,7 @@ test('Domain allow operations', async ({ testUserPage, browser }) => {
       await expect(element).toBeVisible();
     }
   }
+  await cleanupPermissions(apiContext);
 });
 
 test('Domain deny operations', async ({ testUserPage, browser }) => {
@@ -164,6 +167,7 @@ test('Domain deny operations', async ({ testUserPage, browser }) => {
   // Setup deny permissions
   const page = await browser.newPage();
   await adminUser.login(page);
+  const { apiContext } = await getApiContext(page);
   await initializePermissions(page, 'deny', [
     'EditDescription',
     'EditOwners',
@@ -225,6 +229,7 @@ test('Domain deny operations', async ({ testUserPage, browser }) => {
       await expect(element).not.toBeVisible();
     }
   }
+  await cleanupPermissions(apiContext);
 });
 
 test.afterAll('Cleanup domain', async ({ browser }) => {
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permissions/GlossaryPermissions.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permissions/GlossaryPermissions.spec.ts
index 4299feb9afe..51a5d30500a 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permissions/GlossaryPermissions.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Permissions/GlossaryPermissions.spec.ts
@@ -17,9 +17,10 @@ import { EntityDataClass } from '../../../support/entity/EntityDataClass';
 import { Glossary } from '../../../support/glossary/Glossary';
 import { UserClass } from '../../../support/user/UserClass';
 import { performAdminLogin } from '../../../utils/admin';
-import { redirectToHomePage } from '../../../utils/common';
+import { getApiContext, redirectToHomePage } from '../../../utils/common';
 import {
   assignRoleToUser,
+  cleanupPermissions,
   initializePermissions,
 } from '../../../utils/permission';
 import { sidebarClick } from '../../../utils/sidebar';
@@ -73,6 +74,7 @@ test('Glossary allow operations', async ({ testUserPage, browser }) => {
 
   const page = await browser.newPage();
   await adminUser.login(page);
+  const { apiContext } = await getApiContext(page);
   await initializePermissions(page, 'allow', [
     'EditDescription',
     'EditOwners',
@@ -127,6 +129,7 @@ test('Glossary allow operations', async ({ testUserPage, browser }) => {
       await expect(element).toBeVisible();
     }
   }
+  await cleanupPermissions(apiContext);
 });
 
 test('Glossary deny operations', async ({ testUserPage, browser }) => {
@@ -134,6 +137,7 @@ test('Glossary deny operations', async ({ testUserPage, browser }) => {
 
   // Setup deny permissions
   const page = await browser.newPage();
+  const { apiContext } = await getApiContext(page);
   await adminUser.login(page);
   await initializePermissions(page, 'deny', [
     'EditDescription',
@@ -191,6 +195,7 @@ test('Glossary deny operations', async ({ testUserPage, browser }) => {
       await expect(element).not.toBeVisible();
     }
   }
+  await cleanupPermissions(apiContext);
 });
 
 test.afterAll('Cleanup glossary', async ({ browser }) => {
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts
index 33248a68392..e5e682234ac 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts
@@ -819,6 +819,8 @@ test.describe('Teams Page with Data Consumer User', () => {
     await dataConsumerUser.delete(apiContext);
     await user.delete(apiContext);
     await team.delete(apiContext);
+    await policy.delete(apiContext);
+    await role.delete(apiContext);
     await team2.delete(apiContext);
     await afterAction();
   });
@@ -990,6 +992,13 @@ test.describe('Teams Page action as Owner of Team', () => {
     await afterAction();
   });
 
+  test.afterAll('Cleanup', async ({ browser }) => {
+    const { apiContext, afterAction } = await performAdminLogin(browser);
+    await policy.delete(apiContext);
+    await role.delete(apiContext);
+    await afterAction();
+  });
+
   test.beforeEach('Visit Home Page', async ({ ownerUserPage }) => {
     await redirectToHomePage(ownerUserPage);
   });
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Users.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Users.spec.ts
index bdfd0448e2a..906559332e7 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Users.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Users.spec.ts
@@ -124,6 +124,14 @@ test.beforeAll('Setup pre-requests', async ({ browser }) => {
   await afterAction();
 });
 
+test.afterAll('Cleanup', async ({ browser }) => {
+  const { apiContext, afterAction } = await performAdminLogin(browser);
+  await dataStewardUser.delete(apiContext);
+  await policy.delete(apiContext);
+  await role.delete(apiContext);
+  await afterAction();
+});
+
 test.describe('User with Admin Roles', () => {
   test.slow(true);
 
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/customProperty.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/customProperty.ts
index 9beeffab3b4..9c25313c1c2 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/customProperty.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/customProperty.ts
@@ -570,7 +570,7 @@ export const addCustomPropertiesForEntity = async ({
 }: {
   page: Page;
   propertyName: string;
-  customPropertyData: { description: string; entityApiType: string };
+  customPropertyData: { description: string; entityApiType?: string };
   customType: string;
   enumConfig?: { values: string[]; multiSelect: boolean };
   formatConfig?: string;
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/permission.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/permission.ts
index 2c2d9ca4997..82b87ee7d20 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/permission.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/permission.ts
@@ -241,10 +241,10 @@ export const updateDefaultOrganizationPolicy = async (
 };
 
 export const cleanupPermissions = async (apiContext: APIRequestContext) => {
-  if (role && role.responseData?.id) {
+  if (role?.responseData?.id) {
     await role.delete(apiContext);
   }
-  if (policy && policy.responseData?.id) {
+  if (policy?.responseData?.id) {
     await policy.delete(apiContext);
   }
 };