diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/AutoPilot.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/AutoPilot.spec.ts
index 581e3d54329..ccaa5d68e95 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/AutoPilot.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/AutoPilot.spec.ts
@@ -19,7 +19,6 @@ import KafkaIngestionClass from '../../support/entity/ingestion/KafkaIngestionCl
 import MetabaseIngestionClass from '../../support/entity/ingestion/MetabaseIngestionClass';
 import MlFlowIngestionClass from '../../support/entity/ingestion/MlFlowIngestionClass';
 import MysqlIngestionClass from '../../support/entity/ingestion/MySqlIngestionClass';
-import S3IngestionClass from '../../support/entity/ingestion/S3IngestionClass';
 import { UserClass } from '../../support/user/UserClass';
 import { checkAutoPilotStatus } from '../../utils/AutoPilot';
 import {
@@ -34,7 +33,9 @@ const user = new UserClass();
 
 const services = [
   ApiIngestionClass,
-  S3IngestionClass,
+  // Skipping S3 as it is failing intermittently in CI
+  // Remove the comment when fixed: https://github.com/open-metadata/OpenMetadata/issues/23727
+  // S3IngestionClass,
   MetabaseIngestionClass,
   MysqlIngestionClass,
   KafkaIngestionClass,
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/ServiceForm.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/ServiceForm.spec.ts
index b7853d35073..9ef7e382d69 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/ServiceForm.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/ServiceForm.spec.ts
@@ -67,9 +67,12 @@ test.describe('Service form functionality', async () => {
         .getByRole('button', { name: 'OK' })
         .click();
 
-      await page.waitForSelector('[data-testid="test-connection-modal"]', {
-        state: 'hidden',
-      });
+      await page.waitForSelector(
+        '[data-testid="test-connection-modal"] .ant-modal-mask',
+        {
+          state: 'detached',
+        }
+      );
 
       // Fill superset form details - 2
       await fillSupersetFormDetails({ page, ...supersetFormDetails2 });
@@ -98,9 +101,12 @@ test.describe('Service form functionality', async () => {
         .getByRole('button', { name: 'OK' })
         .click();
 
-      await page.waitForSelector('[data-testid="test-connection-modal"]', {
-        state: 'hidden',
-      });
+      await page.waitForSelector(
+        '[data-testid="test-connection-modal"] .ant-modal-mask',
+        {
+          state: 'detached',
+        }
+      );
 
       // Fill superset form details - 3
       await fillSupersetFormDetails({ page, ...supersetFormDetails3 });
@@ -135,9 +141,12 @@ test.describe('Service form functionality', async () => {
         .getByRole('button', { name: 'OK' })
         .click();
 
-      await page.waitForSelector('[data-testid="test-connection-modal"]', {
-        state: 'hidden',
-      });
+      await page.waitForSelector(
+        '[data-testid="test-connection-modal"] .ant-modal-mask',
+        {
+          state: 'detached',
+        }
+      );
 
       // Fill superset form details - 4
       await fillSupersetFormDetails({ page, ...supersetFormDetails4 });
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/AutoClassification.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/AutoClassification.spec.ts
index d95367eea63..2fda1da16f7 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/AutoClassification.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/AutoClassification.spec.ts
@@ -48,18 +48,10 @@ test.describe('Auto Classification', PLAYWRIGHT_INGESTION_TAG_OBJ, async () => {
     await addAndTriggerAutoClassificationPipeline(page, mysqlService);
 
     // Check if the classification is successful
-    const getDatabases = page.waitForResponse(
-      (response) =>
-        response.url().includes('/api/v1/databases?service=') &&
-        response.request().method() === 'GET' &&
-        response.status() === 200
-    );
 
     // Click on databases tab
     await page.click('.ant-tabs-nav-list [data-testid="databases"]');
 
-    await getDatabases;
-
     // Click on the database name
     await page.getByTestId('column-name').getByText('default').click();
 
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/ServiceIngestion.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/ServiceIngestion.spec.ts
index 8315c23ff6f..0d7d8ff3a4d 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/ServiceIngestion.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/ServiceIngestion.spec.ts
@@ -24,7 +24,6 @@ import MlFlowIngestionClass from '../../support/entity/ingestion/MlFlowIngestion
 import MysqlIngestionClass from '../../support/entity/ingestion/MySqlIngestionClass';
 import PostgresIngestionClass from '../../support/entity/ingestion/PostgresIngestionClass';
 import RedshiftWithDBTIngestionClass from '../../support/entity/ingestion/RedshiftWithDBTIngestionClass';
-import S3IngestionClass from '../../support/entity/ingestion/S3IngestionClass';
 import SnowflakeIngestionClass from '../../support/entity/ingestion/SnowflakeIngestionClass';
 import SupersetIngestionClass from '../../support/entity/ingestion/SupersetIngestionClass';
 import { TableClass } from '../../support/entity/TableClass';
@@ -38,7 +37,9 @@ import { settingClick, SettingOptionsType } from '../../utils/sidebar';
 const table = new TableClass();
 const services = [
   ApiIngestionClass,
-  S3IngestionClass,
+  // Skipping S3 as it is failing intermittently in CI
+  // Remove the comment when fixed: https://github.com/open-metadata/OpenMetadata/issues/23727
+  // S3IngestionClass,
   MetabaseIngestionClass,
   MysqlIngestionClass,
   BigQueryIngestionClass,
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/support/entity/ingestion/RedshiftWithDBTIngestionClass.ts b/openmetadata-ui/src/main/resources/ui/playwright/support/entity/ingestion/RedshiftWithDBTIngestionClass.ts
index a1aec03af44..f2ed8bcee58 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/support/entity/ingestion/RedshiftWithDBTIngestionClass.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/support/entity/ingestion/RedshiftWithDBTIngestionClass.ts
@@ -131,11 +131,10 @@ class RedshiftWithDBTIngestionClass extends ServiceBaseClass {
       await page.click('[data-menu-id*="dbt"]');
 
       await page.waitForSelector('#root\\/dbtConfigSource__oneof_select');
-      await page
-        .getByTestId('select-widget-root/dbtConfigSource__oneof_select')
-        .getByRole('combobox')
-        .click({ force: true });
-      await page.click('.ant-select-dropdown:visible [title="DBT S3 Config"]');
+      await page.selectOption(
+        '#root\\/dbtConfigSource__oneof_select',
+        'DBT S3 Config'
+      );
       await page.fill(
         '#root\\/dbtConfigSource\\/dbtSecurityConfig\\/awsAccessKeyId',
         process.env.PLAYWRIGHT_S3_STORAGE_ACCESS_KEY_ID ?? ''
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/serviceFormUtils.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/serviceFormUtils.ts
index b380971c905..24daa3d41de 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/serviceFormUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/serviceFormUtils.ts
@@ -30,17 +30,13 @@ export const fillSupersetFormDetails = async ({
   if (connectionType === 'SupersetApiConnection') {
     await page
       .getByTestId('select-widget-root/connection__oneof_select')
-      .getByRole('combobox')
-      .click({ force: true });
+      .click();
     await page.click(
       `.ant-select-dropdown:visible [title="${connectionType}"]`
     );
 
     if (provider) {
-      await page
-        .getByTestId('select-widget-root/connection/provider')
-        .getByRole('combobox')
-        .click({ force: true });
+      await page.getByTestId('select-widget-root/connection/provider').click();
       await page.click(`.ant-select-dropdown:visible [title="${provider}"]`);
     }
   } else if (
@@ -49,8 +45,7 @@ export const fillSupersetFormDetails = async ({
   ) {
     await page
       .getByTestId('select-widget-root/connection__oneof_select')
-      .getByRole('combobox')
-      .click({ force: true });
+      .click();
     await page.click(
       `.ant-select-dropdown:visible [title="${connectionType}"]`
     );