diff --git a/.run/Template JUnit.run.xml b/.run/Template JUnit.run.xml
index e9df4c41e253..a76cd50c6bd1 100644
--- a/.run/Template JUnit.run.xml	
+++ b/.run/Template JUnit.run.xml	
@@ -5,7 +5,7 @@
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -DjdbcContainerClassName=org.testcontainers.containers.MySQLContainer -DjdbcContainerImage=mysql:8 -DelasticSearchContainerClassName=docker.elastic.co/elasticsearch/elasticsearch:8.10.2 -DopenSearchContainerClassName=opensearchproject/opensearch:1.3.0 -DrunESTestCases=false"/>
+    <option name="VM_PARAMETERS" value="-ea -DjdbcContainerClassName=org.testcontainers.containers.MySQLContainer -DjdbcContainerImage=mysql:8 -DelasticSearchContainerClassName=docker.elastic.co/elasticsearch/elasticsearch:8.11.4 -DopenSearchContainerClassName=opensearchproject/opensearch:1.3.0 -DrunESTestCases=false"/>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/docker/development/docker-compose-gcp.yml b/docker/development/docker-compose-gcp.yml
index 169cee1a5914..2e8c31421e21 100644
--- a/docker/development/docker-compose-gcp.yml
+++ b/docker/development/docker-compose-gcp.yml
@@ -46,7 +46,7 @@ services:
      - ./docker-volume/db-data:/var/lib/mysql
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4
     container_name: openmetadata_elasticsearch
     environment:
       - discovery.type=single-node
diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml
index ba05ead6d895..b5509137a521 100644
--- a/docker/development/docker-compose.yml
+++ b/docker/development/docker-compose.yml
@@ -42,7 +42,7 @@ services:
      - ./docker-volume/db-data:/var/lib/mysql
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4
     container_name: openmetadata_elasticsearch
     environment:
       - discovery.type=single-node
diff --git a/docker/docker-compose-quickstart/docker-compose-postgres.yml b/docker/docker-compose-quickstart/docker-compose-postgres.yml
index 66ac68bb7660..4b279df6cb28 100644
--- a/docker/docker-compose-quickstart/docker-compose-postgres.yml
+++ b/docker/docker-compose-quickstart/docker-compose-postgres.yml
@@ -41,7 +41,7 @@ services:
 
   elasticsearch:
     container_name: openmetadata_elasticsearch
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4
     environment:
       - discovery.type=single-node
       - ES_JAVA_OPTS=-Xms1024m -Xmx1024m
diff --git a/docker/docker-compose-quickstart/docker-compose.yml b/docker/docker-compose-quickstart/docker-compose.yml
index 7ce4f1479b7e..a66b57ddfb63 100644
--- a/docker/docker-compose-quickstart/docker-compose.yml
+++ b/docker/docker-compose-quickstart/docker-compose.yml
@@ -39,7 +39,7 @@ services:
 
   elasticsearch:
     container_name: openmetadata_elasticsearch
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4
     environment:
       - discovery.type=single-node
       - ES_JAVA_OPTS=-Xms1024m -Xmx1024m
diff --git a/ingestion/src/metadata/ingestion/connections/test_connections.py b/ingestion/src/metadata/ingestion/connections/test_connections.py
index 3b3f98756a69..c71b04a89d4e 100644
--- a/ingestion/src/metadata/ingestion/connections/test_connections.py
+++ b/ingestion/src/metadata/ingestion/connections/test_connections.py
@@ -103,7 +103,7 @@ def _test_connection_steps(
             metadata=metadata, steps=steps, automation_workflow=automation_workflow
         )
 
-    return _test_connection_steps_and_raise(steps=steps)
+    return _test_connection_steps_during_ingestion(steps=steps)
 
 
 def _test_connection_steps_automation_workflow(
@@ -231,16 +231,9 @@ def _test_connection_steps_during_ingestion(
     return test_connection_result
 
 
-def _test_connection_steps_and_raise(
-    steps: List[TestConnectionStep],
-) -> TestConnectionResult:
-    """
-    Run the test connection as part of the ingestion workflow
-    Raise an exception if something fails
-    """
-    test_connection_result = _test_connection_steps_during_ingestion(steps)
-
-    for step in test_connection_result.steps:
+def raise_test_connection_exception(result: TestConnectionResult) -> None:
+    """Raise if needed an exception for the test connection"""
+    for step in result.steps:
         if not step.passed and step.mandatory:
             raise SourceConnectionException(
                 f"Failed to run the test connection step: {step.name}"
@@ -250,8 +243,6 @@ def _test_connection_steps_and_raise(
                 f"You might be missing metadata in: {step.name} due to {step.message}"
             )
 
-    return test_connection_result
-
 
 def test_connection_steps(
     metadata: OpenMetadata,
@@ -319,7 +310,7 @@ def test_connection_db_common(
     automation_workflow: Optional[AutomationWorkflow] = None,
     queries: dict = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -351,7 +342,7 @@ def test_connection_db_common(
     for key, query in queries.items():
         test_fn[key] = partial(test_query, statement=query, engine=engine)
 
-    test_connection_steps(
+    result = test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
@@ -361,6 +352,8 @@ def test_connection_db_common(
 
     kill_active_connections(engine)
 
+    return result
+
 
 def test_connection_db_schema_sources(
     metadata: OpenMetadata,
@@ -369,7 +362,7 @@ def test_connection_db_schema_sources(
     automation_workflow: Optional[AutomationWorkflow] = None,
     queries: dict = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -418,7 +411,7 @@ def custom_executor(engine_: Engine, inspector_fn_str: str):
     for key, query in queries.items():
         test_fn[key] = partial(test_query, statement=query, engine=engine)
 
-    test_connection_steps(
+    result = test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
@@ -428,6 +421,8 @@ def custom_executor(engine_: Engine, inspector_fn_str: str):
 
     kill_active_connections(engine)
 
+    return result
+
 
 def test_query(engine: Engine, statement: str):
     """
diff --git a/ingestion/src/metadata/ingestion/source/api/api_service.py b/ingestion/src/metadata/ingestion/source/api/api_service.py
index b5f10c99c255..6b5e7380c785 100644
--- a/ingestion/src/metadata/ingestion/source/api/api_service.py
+++ b/ingestion/src/metadata/ingestion/source/api/api_service.py
@@ -39,6 +39,9 @@
 from metadata.ingestion.api.models import Either
 from metadata.ingestion.api.steps import Source
 from metadata.ingestion.api.topology_runner import TopologyRunnerMixin
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.models.delete_entity import DeleteEntity
 from metadata.ingestion.models.topology import (
     NodeStage,
@@ -175,7 +178,10 @@ def close(self):
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
 
     def mark_api_collections_as_deleted(self) -> Iterable[Either[DeleteEntity]]:
         """Method to mark the api collection as deleted"""
diff --git a/ingestion/src/metadata/ingestion/source/api/rest/connection.py b/ingestion/src/metadata/ingestion/source/api/rest/connection.py
index 676a053f8069..2aa2f09c165c 100644
--- a/ingestion/src/metadata/ingestion/source/api/rest/connection.py
+++ b/ingestion/src/metadata/ingestion/source/api/rest/connection.py
@@ -23,6 +23,9 @@
 from metadata.generated.schema.entity.services.connections.api.restConnection import (
     RestConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -56,7 +59,7 @@ def test_connection(
     service_connection: RestConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -81,7 +84,7 @@ def custom_schema_exec():
 
     test_fn = {"CheckURL": custom_url_exec, "CheckSchema": custom_schema_exec}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/dashboard_service.py b/ingestion/src/metadata/ingestion/source/dashboard/dashboard_service.py
index 5a30430c4eec..96df9f912f78 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/dashboard_service.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/dashboard_service.py
@@ -55,6 +55,9 @@
 from metadata.ingestion.api.models import Either, Entity
 from metadata.ingestion.api.steps import Source
 from metadata.ingestion.api.topology_runner import C, TopologyRunnerMixin
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.lineage.sql_lineage import get_column_fqn
 from metadata.ingestion.models.delete_entity import DeleteEntity
 from metadata.ingestion.models.ometa_classification import OMetaTagAndClassification
@@ -554,7 +557,10 @@ def get_dashboard(self) -> Any:
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
 
     def prepare(self):
         """By default, nothing to prepare"""
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/domodashboard/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/domodashboard/connection.py
index ee60049c5d87..7bc32cdf63d0 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/domodashboard/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/domodashboard/connection.py
@@ -23,6 +23,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.domoDashboardConnection import (
     DomoDashboardConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import (
     SourceConnectionException,
     test_connection_steps,
@@ -58,7 +61,7 @@ def test_connection(
     service_connection: DomoDashboardConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -73,7 +76,7 @@ def custom_test_page_list():
         "GetCharts": client.custom.test_list_cards,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/lightdash/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/lightdash/connection.py
index aa8b0554e630..1d0cb137eb0c 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/lightdash/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/lightdash/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.lightdashConnection import (
     LightdashConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import (
     SourceConnectionException,
     test_connection_steps,
@@ -50,7 +53,7 @@ def test_connection(
     service_connection: LightdashConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -61,7 +64,7 @@ def custom_executor():
 
     test_fn = {"GetDashboards": custom_executor}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/looker/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/looker/connection.py
index 4803d544cca2..cee7c9f2d68a 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/looker/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/looker/connection.py
@@ -24,6 +24,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.lookerConnection import (
     LookerConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -51,7 +54,7 @@ def test_connection(
     service_connection: LookerConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -78,7 +81,7 @@ def validate_api_version():
         "ListLookMLModels": list_datamodels_test,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/metabase/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/metabase/connection.py
index 6ac232c2a3fc..f8c09bc85992 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/metabase/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/metabase/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.metabaseConnection import (
     MetabaseConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.dashboard.metabase.client import MetabaseClient
@@ -39,7 +42,7 @@ def test_connection(
     service_connection: MetabaseConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -51,7 +54,7 @@ def custom_executor():
 
     test_fn = {"GetDashboards": custom_executor}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/mode/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/mode/connection.py
index ece0bcd97d23..96a670538a4c 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/mode/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/mode/connection.py
@@ -21,6 +21,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.modeConnection import (
     ModeConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.dashboard.mode.client import ModeApiClient
@@ -40,7 +43,7 @@ def test_connection(
     service_connection: ModeConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -52,7 +55,7 @@ def test_connection(
         )
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/mstr/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/mstr/connection.py
index fc193ddf6734..156022a8aaca 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/mstr/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/mstr/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.mstrConnection import (
     MstrConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.dashboard.mstr.client import MSTRClient
@@ -39,7 +42,7 @@ def test_connection(
     service_connection: MstrConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -47,7 +50,7 @@ def test_connection(
 
     test_fn = {"GetProjects": client.get_projects_list}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/powerbi/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/powerbi/connection.py
index 2ac8f064866f..a7a73e7f406a 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/powerbi/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/powerbi/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.powerBIConnection import (
     PowerBIConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.dashboard.powerbi.client import (
@@ -48,14 +51,14 @@ def test_connection(
     service_connection: PowerBIConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
     test_fn = {"GetDashboards": client.api_client.fetch_dashboards}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/qlikcloud/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/qlikcloud/connection.py
index 257c58623a9f..784d5088f2a0 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/qlikcloud/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/qlikcloud/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.qlikCloudConnection import (
     QlikCloudConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.dashboard.qlikcloud.client import QlikCloudClient
@@ -39,7 +42,7 @@ def test_connection(
     service_connection: QlikCloudConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -47,7 +50,7 @@ def test_connection(
 
     test_fn = {"GetDashboards": client.get_dashboards_list_test_conn}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/qliksense/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/qliksense/connection.py
index 2cbd25bdb7cc..6ef88f4066a7 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/qliksense/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/qliksense/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.qlikSenseConnection import (
     QlikSenseConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.dashboard.qliksense.client import QlikSenseClient
@@ -39,7 +42,7 @@ def test_connection(
     service_connection: QlikSenseConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -47,7 +50,7 @@ def test_connection(
 
     test_fn = {"GetDashboards": client.get_dashboard_for_test_connection}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/quicksight/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/quicksight/connection.py
index 22786be835ee..6926a140eb8e 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/quicksight/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/quicksight/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.quickSightConnection import (
     QuickSightConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -45,7 +48,7 @@ def test_connection(
     service_connection: QuickSightConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -57,7 +60,7 @@ def test_connection(
         )
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/redash/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/redash/connection.py
index cfb43fcc1b04..a0aa013aa01d 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/redash/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/redash/connection.py
@@ -21,6 +21,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.redashConnection import (
     RedashConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import (
     SourceConnectionException,
     test_connection_steps,
@@ -47,7 +50,7 @@ def test_connection(
     service_connection: RedashConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -55,7 +58,7 @@ def test_connection(
 
     test_fn = {"GetDashboards": client.dashboards}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/sigma/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/sigma/connection.py
index 0cb9c78306d5..a6d33c67d930 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/sigma/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/sigma/connection.py
@@ -21,6 +21,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.sigmaConnection import (
     SigmaConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import (
     SourceConnectionException,
     test_connection_steps,
@@ -47,7 +50,7 @@ def test_connection(
     service_connection: SigmaConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -55,7 +58,7 @@ def test_connection(
 
     test_fn = {"GetToken": client.get_auth_token, "GetWorkbooks": client.get_dashboards}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/superset/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/superset/connection.py
index e4aac1aa13ba..1aa87e343831 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/superset/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/superset/connection.py
@@ -29,6 +29,9 @@
 from metadata.generated.schema.entity.services.connections.database.postgresConnection import (
     PostgresConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.generated.schema.entity.utils.supersetApiConnection import (
     SupersetApiConnection,
 )
@@ -71,7 +74,7 @@ def test_connection(
     service_connection: SupersetConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -93,7 +96,7 @@ def test_connection(
         else:
             test_fn["GetCharts"] = partial(test_query, client, FETCH_ALL_CHARTS_TEST)
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/dashboard/tableau/connection.py b/ingestion/src/metadata/ingestion/source/dashboard/tableau/connection.py
index 191cf83334d1..e3e976e62b8d 100644
--- a/ingestion/src/metadata/ingestion/source/dashboard/tableau/connection.py
+++ b/ingestion/src/metadata/ingestion/source/dashboard/tableau/connection.py
@@ -24,6 +24,9 @@
 from metadata.generated.schema.entity.services.connections.dashboard.tableauConnection import (
     TableauConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.generated.schema.security.credentials.accessTokenAuth import (
     AccessTokenAuth,
 )
@@ -72,7 +75,7 @@ def test_connection(
     service_connection: TableauConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -103,7 +106,7 @@ def test_connection(
         "GetDataModels": client.test_get_datamodels,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/athena/connection.py b/ingestion/src/metadata/ingestion/source/database/athena/connection.py
index 67d422df14fe..59baec43250e 100644
--- a/ingestion/src/metadata/ingestion/source/database/athena/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/athena/connection.py
@@ -27,6 +27,9 @@
 from metadata.generated.schema.entity.services.connections.database.athenaConnection import (
     AthenaConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -96,7 +99,7 @@ def test_connection(
     service_connection: AthenaConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -123,7 +126,7 @@ def custom_executor_for_view():
         "GetViews": custom_executor_for_view,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/azuresql/connection.py b/ingestion/src/metadata/ingestion/source/database/azuresql/connection.py
index e2a47dbe409f..fe01c321b157 100644
--- a/ingestion/src/metadata/ingestion/source/database/azuresql/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/azuresql/connection.py
@@ -28,6 +28,9 @@
 from metadata.generated.schema.entity.services.connections.database.mssqlConnection import (
     MssqlConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -107,12 +110,12 @@ def test_connection(
     service_connection: AzureSQLConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/bigquery/connection.py b/ingestion/src/metadata/ingestion/source/database/bigquery/connection.py
index ac4d4031e4c9..132f0671953d 100644
--- a/ingestion/src/metadata/ingestion/source/database/bigquery/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/bigquery/connection.py
@@ -27,6 +27,9 @@
 from metadata.generated.schema.entity.services.connections.database.bigQueryConnection import (
     BigQueryConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.generated.schema.security.credentials.gcpCredentials import (
     GcpCredentialsPath,
 )
@@ -111,7 +114,7 @@ def test_connection(
     service_connection: BigQueryConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -165,7 +168,7 @@ def test_connection_inner(engine):
             ),
         }
 
-        test_connection_steps(
+        return test_connection_steps(
             metadata=metadata,
             test_fn=test_fn,
             service_type=service_connection.type.value,
@@ -173,7 +176,7 @@ def test_connection_inner(engine):
             timeout_seconds=timeout_seconds,
         )
 
-    test_connection_inner(engine)
+    return test_connection_inner(engine)
 
 
 def get_table_view_names(connection, schema=None):
diff --git a/ingestion/src/metadata/ingestion/source/database/bigtable/connection.py b/ingestion/src/metadata/ingestion/source/database/bigtable/connection.py
index 303453c129d2..4665e1004124 100644
--- a/ingestion/src/metadata/ingestion/source/database/bigtable/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/bigtable/connection.py
@@ -19,6 +19,9 @@
 from metadata.generated.schema.entity.services.connections.database.bigTableConnection import (
     BigTableConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.generated.schema.security.credentials.gcpValues import (
     GcpCredentialsValues,
     SingleProjectId,
@@ -97,7 +100,7 @@ def test_connection(
     service_connection: BigTableConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -110,7 +113,7 @@ def test_connection(
         "GetRows": tester.get_row,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/clickhouse/connection.py b/ingestion/src/metadata/ingestion/source/database/clickhouse/connection.py
index 07357ef071c0..020f8ab3df0b 100644
--- a/ingestion/src/metadata/ingestion/source/database/clickhouse/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/clickhouse/connection.py
@@ -23,6 +23,9 @@
 from metadata.generated.schema.entity.services.connections.database.clickhouseConnection import (
     ClickhouseConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -69,7 +72,7 @@ def test_connection(
     service_connection: ClickhouseConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -77,7 +80,7 @@ def test_connection(
 
     queries = {"GetQueries": CLICKHOUSE_SQL_STATEMENT_TEST}
 
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/couchbase/connection.py b/ingestion/src/metadata/ingestion/source/database/couchbase/connection.py
index 537c1896ccc2..8a6a8f67547e 100644
--- a/ingestion/src/metadata/ingestion/source/database/couchbase/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/couchbase/connection.py
@@ -23,6 +23,9 @@
 from metadata.generated.schema.entity.services.connections.database.couchbaseConnection import (
     CouchbaseConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -51,7 +54,7 @@ def test_connection(
     service_connection: CouchbaseConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -82,7 +85,7 @@ def test_get_collections(client: Cluster, holder: SchemaHolder):
         "GetCollections": partial(test_get_collections, client, holder),
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/database_service.py b/ingestion/src/metadata/ingestion/source/database/database_service.py
index aee239c55efe..600f211170fb 100644
--- a/ingestion/src/metadata/ingestion/source/database/database_service.py
+++ b/ingestion/src/metadata/ingestion/source/database/database_service.py
@@ -58,6 +58,9 @@
 from metadata.ingestion.api.models import Either
 from metadata.ingestion.api.steps import Source
 from metadata.ingestion.api.topology_runner import TopologyRunnerMixin
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.models.life_cycle import OMetaLifeCycleData
 from metadata.ingestion.models.ometa_classification import OMetaTagAndClassification
 from metadata.ingestion.models.topology import (
@@ -609,4 +612,7 @@ def yield_external_table_lineage(self) -> Iterable[Either[AddLineageRequest]]:
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
diff --git a/ingestion/src/metadata/ingestion/source/database/databricks/connection.py b/ingestion/src/metadata/ingestion/source/database/databricks/connection.py
index e737122b55e9..14d3d3e392e9 100644
--- a/ingestion/src/metadata/ingestion/source/database/databricks/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/databricks/connection.py
@@ -25,6 +25,9 @@
 from metadata.generated.schema.entity.services.connections.database.databricksConnection import (
     DatabricksConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -73,7 +76,7 @@ def test_connection(
     service_connection: DatabricksConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -106,7 +109,7 @@ def test_database_query(engine: Engine, statement: str):
         "GetQueries": client.test_query_api_access,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/datalake/connection.py b/ingestion/src/metadata/ingestion/source/database/datalake/connection.py
index fed07e769625..fdc11f6021d0 100644
--- a/ingestion/src/metadata/ingestion/source/database/datalake/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/datalake/connection.py
@@ -31,6 +31,9 @@
 from metadata.generated.schema.entity.services.connections.database.datalakeConnection import (
     DatalakeConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.database.datalake.clients.azure_blob import (
@@ -93,7 +96,7 @@ def test_connection(
     service_connection: DatalakeConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -104,7 +107,7 @@ def test_connection(
         ),
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/db2/connection.py b/ingestion/src/metadata/ingestion/source/database/db2/connection.py
index 1b974804a828..cadde6775f38 100644
--- a/ingestion/src/metadata/ingestion/source/database/db2/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/db2/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.database.db2Connection import (
     Db2Connection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -49,12 +52,12 @@ def test_connection(
     service_connection: Db2Connection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/deltalake/connection.py b/ingestion/src/metadata/ingestion/source/database/deltalake/connection.py
index 41f7c79621cd..20d799007a1e 100644
--- a/ingestion/src/metadata/ingestion/source/database/deltalake/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/deltalake/connection.py
@@ -31,6 +31,9 @@
 from metadata.generated.schema.entity.services.connections.database.deltaLakeConnection import (
     DeltaLakeConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -85,7 +88,7 @@ def test_connection(
     service_connection: DeltaLakeConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -99,7 +102,7 @@ def test_connection(
         ),
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/domodatabase/connection.py b/ingestion/src/metadata/ingestion/source/database/domodatabase/connection.py
index e822002145c0..3dbe0729e52f 100644
--- a/ingestion/src/metadata/ingestion/source/database/domodatabase/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/domodatabase/connection.py
@@ -23,6 +23,9 @@
 from metadata.generated.schema.entity.services.connections.database.domoDatabaseConnection import (
     DomoDatabaseConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import (
     SourceConnectionException,
     test_connection_steps,
@@ -53,7 +56,7 @@ def test_connection(
     service_connection: DomoDatabaseConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -67,7 +70,7 @@ def custom_executor():
         "GetTables": custom_executor,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/doris/connection.py b/ingestion/src/metadata/ingestion/source/database/doris/connection.py
index c77c1f701cd2..4707ea926637 100644
--- a/ingestion/src/metadata/ingestion/source/database/doris/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/doris/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.database.dorisConnection import (
     DorisConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -51,12 +54,12 @@ def test_connection(
     service_connection: DorisConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
-    test_connection_db_schema_sources(
+    return test_connection_db_schema_sources(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/druid/connection.py b/ingestion/src/metadata/ingestion/source/database/druid/connection.py
index 840add585b52..a43b76df34c7 100644
--- a/ingestion/src/metadata/ingestion/source/database/druid/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/druid/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.database.druidConnection import (
     DruidConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -54,12 +57,12 @@ def test_connection(
     service_connection: DruidConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/dynamodb/connection.py b/ingestion/src/metadata/ingestion/source/database/dynamodb/connection.py
index b6aee09810be..085b37e366a0 100644
--- a/ingestion/src/metadata/ingestion/source/database/dynamodb/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/dynamodb/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.database.dynamoDBConnection import (
     DynamoDBConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -50,7 +53,7 @@ def test_connection(
     service_connection: DynamoDBConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -60,7 +63,7 @@ def test_connection(
         "ListTables": partial(check_list_tables, client),
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/glue/connection.py b/ingestion/src/metadata/ingestion/source/database/glue/connection.py
index 90ebbc8aa2e2..d1f8f4649bb7 100644
--- a/ingestion/src/metadata/ingestion/source/database/glue/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/glue/connection.py
@@ -23,6 +23,9 @@
 from metadata.generated.schema.entity.services.connections.database.glueConnection import (
     GlueConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -41,7 +44,7 @@ def test_connection(
     service_connection: GlueConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -66,7 +69,7 @@ def custom_executor_for_table():
         "GetTables": custom_executor_for_table,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/greenplum/connection.py b/ingestion/src/metadata/ingestion/source/database/greenplum/connection.py
index 976bb94ca727..b9ad6eff9d01 100644
--- a/ingestion/src/metadata/ingestion/source/database/greenplum/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/greenplum/connection.py
@@ -23,6 +23,9 @@
 from metadata.generated.schema.entity.services.connections.database.greenplumConnection import (
     GreenplumConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -51,7 +54,7 @@ def test_connection(
     service_connection: GreenplumConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -59,7 +62,7 @@ def test_connection(
     queries = {
         "GetDatabases": GREENPLUM_GET_DATABASE,
     }
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/hive/connection.py b/ingestion/src/metadata/ingestion/source/database/hive/connection.py
index 8569e02642b5..0681f72c20ca 100644
--- a/ingestion/src/metadata/ingestion/source/database/hive/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/hive/connection.py
@@ -34,6 +34,9 @@
 from metadata.generated.schema.entity.services.connections.database.postgresConnection import (
     PostgresConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -183,7 +186,7 @@ def test_connection(
     service_connection: HiveConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -207,7 +210,7 @@ def test_connection(
                 raise ValueError("Invalid metastore connection")
         engine = get_metastore_connection(service_connection.metastoreConnection)
 
-    test_connection_db_schema_sources(
+    return test_connection_db_schema_sources(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/iceberg/connection.py b/ingestion/src/metadata/ingestion/source/database/iceberg/connection.py
index 352b83004437..6b8b804dc80b 100644
--- a/ingestion/src/metadata/ingestion/source/database/iceberg/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/iceberg/connection.py
@@ -23,6 +23,9 @@
 from metadata.generated.schema.entity.services.connections.database.icebergConnection import (
     IcebergConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.database.iceberg.catalog import IcebergCatalogFactory
@@ -44,7 +47,7 @@ def test_connection(
     service_connection: IcebergConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -62,7 +65,7 @@ def custom_executor_for_tables():
         "GetTables": custom_executor_for_tables,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/impala/connection.py b/ingestion/src/metadata/ingestion/source/database/impala/connection.py
index 62920aa20259..4a984214ae27 100644
--- a/ingestion/src/metadata/ingestion/source/database/impala/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/impala/connection.py
@@ -24,6 +24,9 @@
 from metadata.generated.schema.entity.services.connections.database.impalaConnection import (
     ImpalaConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -110,12 +113,12 @@ def test_connection(
     service_connection: ImpalaConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
-    test_connection_db_schema_sources(
+    return test_connection_db_schema_sources(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/mariadb/connection.py b/ingestion/src/metadata/ingestion/source/database/mariadb/connection.py
index c4e15423a072..1af77fab582e 100644
--- a/ingestion/src/metadata/ingestion/source/database/mariadb/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/mariadb/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.database.mariaDBConnection import (
     MariaDBConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -51,12 +54,12 @@ def test_connection(
     service_connection: MariaDBConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
-    test_connection_db_schema_sources(
+    return test_connection_db_schema_sources(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/mongodb/connection.py b/ingestion/src/metadata/ingestion/source/database/mongodb/connection.py
index 9f9697a274a6..0d77e2c16568 100644
--- a/ingestion/src/metadata/ingestion/source/database/mongodb/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/mongodb/connection.py
@@ -26,6 +26,9 @@
 from metadata.generated.schema.entity.services.connections.database.mongoDBConnection import (
     MongoDBConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import get_connection_url_common
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
@@ -46,7 +49,7 @@ def test_connection(
     service_connection: MongoDBConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -72,7 +75,7 @@ def test_get_collections(client_: MongoClient, holder_: SchemaHolder):
         "GetCollections": partial(test_get_collections, client, holder),
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/mssql/connection.py b/ingestion/src/metadata/ingestion/source/database/mssql/connection.py
index d1664cc2f5ae..92d8b1281226 100644
--- a/ingestion/src/metadata/ingestion/source/database/mssql/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/mssql/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.database.mssqlConnection import (
     MssqlConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -62,7 +65,7 @@ def test_connection(
     service_connection: MssqlConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -71,7 +74,7 @@ def test_connection(
         "GetQueries": MSSQL_TEST_GET_QUERIES,
         "GetDatabases": MSSQL_GET_DATABASE,
     }
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/mysql/connection.py b/ingestion/src/metadata/ingestion/source/database/mysql/connection.py
index a8bd34f77863..86dc523ef8b2 100644
--- a/ingestion/src/metadata/ingestion/source/database/mysql/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/mysql/connection.py
@@ -26,6 +26,9 @@
 from metadata.generated.schema.entity.services.connections.database.mysqlConnection import (
     MysqlConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -65,12 +68,12 @@ def test_connection(
     service_connection: MysqlConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
-    test_connection_db_schema_sources(
+    return test_connection_db_schema_sources(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/oracle/connection.py b/ingestion/src/metadata/ingestion/source/database/oracle/connection.py
index 2323c6875a07..83665684cbc2 100644
--- a/ingestion/src/metadata/ingestion/source/database/oracle/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/oracle/connection.py
@@ -31,6 +31,9 @@
     OracleServiceName,
     OracleTNSConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -134,7 +137,7 @@ def test_connection(
     service_connection: OracleConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -142,7 +145,7 @@ def test_connection(
 
     test_conn_queries = {"CheckAccess": CHECK_ACCESS_TO_ALL}
 
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/pinotdb/connection.py b/ingestion/src/metadata/ingestion/source/database/pinotdb/connection.py
index 4051da4fd1e3..8f148f3718a3 100644
--- a/ingestion/src/metadata/ingestion/source/database/pinotdb/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/pinotdb/connection.py
@@ -23,6 +23,9 @@
 from metadata.generated.schema.entity.services.connections.database.pinotDBConnection import (
     PinotDBConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -65,12 +68,12 @@ def test_connection(
     service_connection: PinotDBConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/postgres/connection.py b/ingestion/src/metadata/ingestion/source/database/postgres/connection.py
index fab91e4e9215..f447f13dfb9e 100644
--- a/ingestion/src/metadata/ingestion/source/database/postgres/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/postgres/connection.py
@@ -27,6 +27,9 @@
 from metadata.generated.schema.entity.services.connections.database.postgresConnection import (
     PostgresConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -73,7 +76,7 @@ def test_connection(
     service_connection: PostgresConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -86,7 +89,7 @@ def test_connection(
         "GetDatabases": POSTGRES_GET_DATABASE,
         "GetTags": POSTGRES_TEST_GET_TAGS,
     }
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/presto/connection.py b/ingestion/src/metadata/ingestion/source/database/presto/connection.py
index 00222d50f503..b45499700912 100644
--- a/ingestion/src/metadata/ingestion/source/database/presto/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/presto/connection.py
@@ -25,6 +25,9 @@
 from metadata.generated.schema.entity.services.connections.database.prestoConnection import (
     PrestoConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -86,7 +89,7 @@ def test_connection(
     service_connection: PrestoConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -110,7 +113,7 @@ def custom_executor_for_table():
         "GetTables": custom_executor_for_table,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/query_parser_source.py b/ingestion/src/metadata/ingestion/source/database/query_parser_source.py
index f502c576a3e3..20d8fbaec0dc 100644
--- a/ingestion/src/metadata/ingestion/source/database/query_parser_source.py
+++ b/ingestion/src/metadata/ingestion/source/database/query_parser_source.py
@@ -20,6 +20,9 @@
 )
 from metadata.generated.schema.type.tableQuery import TableQuery
 from metadata.ingestion.api.steps import Source
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.connections import get_test_connection_fn
 from metadata.utils.helpers import get_start_and_end
@@ -121,4 +124,5 @@ def close(self):
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.engine)
+        result = test_connection_fn(self.engine)
+        raise_test_connection_exception(result)
diff --git a/ingestion/src/metadata/ingestion/source/database/redshift/connection.py b/ingestion/src/metadata/ingestion/source/database/redshift/connection.py
index 4a7db793a633..e904ba8a95db 100644
--- a/ingestion/src/metadata/ingestion/source/database/redshift/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/redshift/connection.py
@@ -24,6 +24,9 @@
 from metadata.generated.schema.entity.services.connections.database.redshiftConnection import (
     RedshiftConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -64,7 +67,7 @@ def test_connection(
     service_connection: RedshiftConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -98,7 +101,7 @@ def test_get_queries_permissions(engine_: Engine):
         ),
     }
 
-    test_connection_steps(
+    result = test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
@@ -107,3 +110,5 @@ def test_get_queries_permissions(engine_: Engine):
     )
 
     kill_active_connections(engine)
+
+    return result
diff --git a/ingestion/src/metadata/ingestion/source/database/salesforce/connection.py b/ingestion/src/metadata/ingestion/source/database/salesforce/connection.py
index d3cac4f4722e..6a41e4389c47 100644
--- a/ingestion/src/metadata/ingestion/source/database/salesforce/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/salesforce/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.database.salesforceConnection import (
     SalesforceConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -50,14 +53,14 @@ def test_connection(
     service_connection: SalesforceConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
     test_fn = {"CheckAccess": client.describe}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/salesforce/metadata.py b/ingestion/src/metadata/ingestion/source/database/salesforce/metadata.py
index ddc6ad4e1665..a40ac76fa694 100644
--- a/ingestion/src/metadata/ingestion/source/database/salesforce/metadata.py
+++ b/ingestion/src/metadata/ingestion/source/database/salesforce/metadata.py
@@ -48,6 +48,9 @@
 from metadata.generated.schema.type.basic import EntityName, FullyQualifiedEntityName
 from metadata.ingestion.api.models import Either
 from metadata.ingestion.api.steps import InvalidSourceException
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.models.ometa_classification import OMetaTagAndClassification
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.connections import get_connection, get_test_connection_fn
@@ -375,4 +378,5 @@ def close(self):
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.client, self.service_connection)
+        result = test_connection_fn(self.client, self.service_connection)
+        raise_test_connection_exception(result)
diff --git a/ingestion/src/metadata/ingestion/source/database/saperp/connection.py b/ingestion/src/metadata/ingestion/source/database/saperp/connection.py
index 2b4ae95e0295..ba5bac40dbb1 100644
--- a/ingestion/src/metadata/ingestion/source/database/saperp/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/saperp/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.database.sapErpConnection import (
     SapErpConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.database.saperp.client import SapErpClient
@@ -39,12 +42,12 @@ def test_connection(
     service_connection: SapErpConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     test_fn = {
         "GetTables": client.test_table_api,
         "GetColumns": client.test_column_api,
     }
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/saphana/connection.py b/ingestion/src/metadata/ingestion/source/database/saphana/connection.py
index b3a4739acb17..ae8fe0ce333c 100644
--- a/ingestion/src/metadata/ingestion/source/database/saphana/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/saphana/connection.py
@@ -30,6 +30,9 @@
 from metadata.generated.schema.entity.services.connections.database.sapHanaConnection import (
     SapHanaConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -158,13 +161,13 @@ def test_connection(
     service_connection: SapHanaConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=_build_test_fn_dict(engine, service_connection),
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/saphana/lineage.py b/ingestion/src/metadata/ingestion/source/database/saphana/lineage.py
index 0c2bdf824adc..c474c4bfea6f 100644
--- a/ingestion/src/metadata/ingestion/source/database/saphana/lineage.py
+++ b/ingestion/src/metadata/ingestion/source/database/saphana/lineage.py
@@ -29,6 +29,9 @@
 )
 from metadata.ingestion.api.models import Either
 from metadata.ingestion.api.steps import InvalidSourceException, Source
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.connections import get_test_connection_fn
 from metadata.ingestion.source.database.saphana.cdata_parser import (
@@ -156,4 +159,5 @@ def parse_cdata(
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.engine)
+        result = test_connection_fn(self.engine)
+        raise_test_connection_exception(result)
diff --git a/ingestion/src/metadata/ingestion/source/database/sas/connection.py b/ingestion/src/metadata/ingestion/source/database/sas/connection.py
index 9acbf4d140cb..014c1286dd67 100644
--- a/ingestion/src/metadata/ingestion/source/database/sas/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/sas/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.database.sasConnection import (
     SASConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.database.sas.client import SASClient
@@ -39,9 +42,9 @@ def test_connection(
     service_connection: SASConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     test_fn = {"CheckAccess": client.check_connection}
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/sas/metadata.py b/ingestion/src/metadata/ingestion/source/database/sas/metadata.py
index aadfc8c3c9fd..c6fbc8fb0c29 100644
--- a/ingestion/src/metadata/ingestion/source/database/sas/metadata.py
+++ b/ingestion/src/metadata/ingestion/source/database/sas/metadata.py
@@ -71,6 +71,9 @@
 from metadata.ingestion.api.common import Entity
 from metadata.ingestion.api.models import Either, StackTraceError
 from metadata.ingestion.api.steps import InvalidSourceException
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.models.ometa_classification import OMetaTagAndClassification
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.connections import get_connection, get_test_connection_fn
@@ -907,4 +910,7 @@ def close(self) -> None:
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
diff --git a/ingestion/src/metadata/ingestion/source/database/singlestore/connection.py b/ingestion/src/metadata/ingestion/source/database/singlestore/connection.py
index 0513a641cde1..c3aa666f4ad0 100644
--- a/ingestion/src/metadata/ingestion/source/database/singlestore/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/singlestore/connection.py
@@ -23,6 +23,9 @@
 from metadata.generated.schema.entity.services.connections.database.singleStoreConnection import (
     SingleStoreConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -52,12 +55,12 @@ def test_connection(
     service_connection: SingleStoreConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
-    test_connection_db_schema_sources(
+    return test_connection_db_schema_sources(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/snowflake/connection.py b/ingestion/src/metadata/ingestion/source/database/snowflake/connection.py
index e85522c5ba36..5cbc9479fbf8 100644
--- a/ingestion/src/metadata/ingestion/source/database/snowflake/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/snowflake/connection.py
@@ -28,6 +28,9 @@
 from metadata.generated.schema.entity.services.connections.database.snowflakeConnection import (
     SnowflakeConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -147,7 +150,7 @@ def test_connection(
     service_connection: SnowflakeConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow.
@@ -192,7 +195,7 @@ def test_connection(
         ),
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/sqlite/connection.py b/ingestion/src/metadata/ingestion/source/database/sqlite/connection.py
index ff4cbdaaa88d..f7215cca7c6b 100644
--- a/ingestion/src/metadata/ingestion/source/database/sqlite/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/sqlite/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.database.sqliteConnection import (
     SQLiteConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -54,12 +57,12 @@ def test_connection(
     service_connection: SQLiteConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/teradata/connection.py b/ingestion/src/metadata/ingestion/source/database/teradata/connection.py
index f1c371b4255f..be8d1e856bd9 100644
--- a/ingestion/src/metadata/ingestion/source/database/teradata/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/teradata/connection.py
@@ -24,6 +24,9 @@
 from metadata.generated.schema.entity.services.connections.database.teradataConnection import (
     TeradataConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -84,14 +87,14 @@ def test_connection(
     service_connection: TeradataConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
     queries = {"GetDatabases": TERADATA_GET_DATABASE}
 
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/trino/connection.py b/ingestion/src/metadata/ingestion/source/database/trino/connection.py
index 2a987a7a7d52..6ee18950850a 100644
--- a/ingestion/src/metadata/ingestion/source/database/trino/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/trino/connection.py
@@ -29,6 +29,9 @@
 from metadata.generated.schema.entity.services.connections.database.trinoConnection import (
     TrinoConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -126,7 +129,7 @@ def test_connection(
     service_connection: TrinoConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -135,7 +138,7 @@ def test_connection(
         "GetDatabases": TRINO_GET_DATABASE,
     }
 
-    test_connection_db_schema_sources(
+    return test_connection_db_schema_sources(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/database/unitycatalog/connection.py b/ingestion/src/metadata/ingestion/source/database/unitycatalog/connection.py
index 3a37052dea90..b17be4dd0222 100644
--- a/ingestion/src/metadata/ingestion/source/database/unitycatalog/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/unitycatalog/connection.py
@@ -23,6 +23,9 @@
 from metadata.generated.schema.entity.services.connections.database.unityCatalogConnection import (
     UnityCatalogConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.database.unitycatalog.client import UnityCatalogClient
@@ -56,7 +59,7 @@ def test_connection(
     service_connection: UnityCatalogConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -94,7 +97,7 @@ def get_tables(connection: WorkspaceClient, table_obj: DatabricksTable):
         "GetQueries": client.test_query_api_access,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/database/unitycatalog/lineage.py b/ingestion/src/metadata/ingestion/source/database/unitycatalog/lineage.py
index cafde0b443f5..3189102eec3e 100644
--- a/ingestion/src/metadata/ingestion/source/database/unitycatalog/lineage.py
+++ b/ingestion/src/metadata/ingestion/source/database/unitycatalog/lineage.py
@@ -30,6 +30,9 @@
 from metadata.generated.schema.type.entityReference import EntityReference
 from metadata.ingestion.api.models import Either
 from metadata.ingestion.api.steps import InvalidSourceException, Source
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.lineage.sql_lineage import get_column_fqn
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.connections import get_test_connection_fn
@@ -159,4 +162,7 @@ def _iter(self, *_, **__) -> Iterable[Either[AddLineageRequest]]:
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
diff --git a/ingestion/src/metadata/ingestion/source/database/vertica/connection.py b/ingestion/src/metadata/ingestion/source/database/vertica/connection.py
index 39f3b41e607d..945564d3ac7e 100644
--- a/ingestion/src/metadata/ingestion/source/database/vertica/connection.py
+++ b/ingestion/src/metadata/ingestion/source/database/vertica/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.database.verticaConnection import (
     VerticaConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import (
     create_generic_db_connection,
     get_connection_args_common,
@@ -53,7 +56,7 @@ def test_connection(
     service_connection: VerticaConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -62,7 +65,7 @@ def test_connection(
         "GetQueries": VERTICA_TEST_GET_QUERIES,
         "GetDatabases": VERTICA_LIST_DATABASES,
     }
-    test_connection_db_common(
+    return test_connection_db_common(
         metadata=metadata,
         engine=engine,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/messaging/kafka/connection.py b/ingestion/src/metadata/ingestion/source/messaging/kafka/connection.py
index 519844534bca..66c05a2d368e 100644
--- a/ingestion/src/metadata/ingestion/source/messaging/kafka/connection.py
+++ b/ingestion/src/metadata/ingestion/source/messaging/kafka/connection.py
@@ -29,6 +29,9 @@
 from metadata.generated.schema.entity.services.connections.messaging.redpandaConnection import (
     RedpandaConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -122,7 +125,7 @@ def test_connection(
     service_connection: Union[KafkaConnection, RedpandaConnection],
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -151,7 +154,7 @@ def schema_registry_test():
         "CheckSchemaRegistry": schema_registry_test,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/messaging/kinesis/connection.py b/ingestion/src/metadata/ingestion/source/messaging/kinesis/connection.py
index b9bc119c1dab..573dd986a65b 100644
--- a/ingestion/src/metadata/ingestion/source/messaging/kinesis/connection.py
+++ b/ingestion/src/metadata/ingestion/source/messaging/kinesis/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.messaging.kinesisConnection import (
     KinesisConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -43,7 +46,7 @@ def test_connection(
     service_connection: KinesisConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -51,7 +54,7 @@ def test_connection(
 
     test_fn = {"GetTopics": client.list_streams}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/messaging/messaging_service.py b/ingestion/src/metadata/ingestion/source/messaging/messaging_service.py
index faa033784a0f..b6d5f0d8eb1f 100644
--- a/ingestion/src/metadata/ingestion/source/messaging/messaging_service.py
+++ b/ingestion/src/metadata/ingestion/source/messaging/messaging_service.py
@@ -34,6 +34,9 @@
 from metadata.ingestion.api.models import Either
 from metadata.ingestion.api.steps import Source
 from metadata.ingestion.api.topology_runner import TopologyRunnerMixin
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.models.delete_entity import DeleteEntity
 from metadata.ingestion.models.topology import (
     NodeStage,
@@ -198,7 +201,10 @@ def prepare(self):
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
 
     def mark_topics_as_deleted(self) -> Iterable[Either[DeleteEntity]]:
         """Method to mark the topics as deleted"""
diff --git a/ingestion/src/metadata/ingestion/source/messaging/redpanda/connection.py b/ingestion/src/metadata/ingestion/source/messaging/redpanda/connection.py
index b923c5c8a025..34c01ceb9dcc 100644
--- a/ingestion/src/metadata/ingestion/source/messaging/redpanda/connection.py
+++ b/ingestion/src/metadata/ingestion/source/messaging/redpanda/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.messaging.redpandaConnection import (
     RedpandaConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.messaging.kafka.connection import KafkaClient
 from metadata.ingestion.source.messaging.kafka.connection import (
@@ -47,13 +50,13 @@ def test_connection(
     service_connection: RedpandaConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
 
-    test_kafka_connection(
+    return test_kafka_connection(
         metadata=metadata,
         client=client,
         service_connection=service_connection,
diff --git a/ingestion/src/metadata/ingestion/source/metadata/alationsink/connection.py b/ingestion/src/metadata/ingestion/source/metadata/alationsink/connection.py
index a3f58a4ef027..64a6b1998925 100644
--- a/ingestion/src/metadata/ingestion/source/metadata/alationsink/connection.py
+++ b/ingestion/src/metadata/ingestion/source/metadata/alationsink/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.metadata.alationSinkConnection import (
     AlationSinkConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.metadata.alationsink.client import AlationSinkClient
@@ -39,7 +42,7 @@ def test_connection(
     service_connection: AlationSinkConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -47,7 +50,7 @@ def test_connection(
 
     test_fn = {"CheckAccess": client.list_native_datasources}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/metadata/alationsink/metadata.py b/ingestion/src/metadata/ingestion/source/metadata/alationsink/metadata.py
index fa83c71ddd52..c29b81f7173b 100644
--- a/ingestion/src/metadata/ingestion/source/metadata/alationsink/metadata.py
+++ b/ingestion/src/metadata/ingestion/source/metadata/alationsink/metadata.py
@@ -33,6 +33,9 @@
 )
 from metadata.ingestion.api.models import Either, Entity
 from metadata.ingestion.api.steps import InvalidSourceException, Source
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.ometa.utils import model_str
 from metadata.ingestion.source.connections import get_connection, get_test_connection_fn
@@ -459,6 +462,7 @@ def close(self):
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(
+        result = test_connection_fn(
             self.metadata, self.alation_sink_client, self.service_connection
         )
+        raise_test_connection_exception(result)
diff --git a/ingestion/src/metadata/ingestion/source/metadata/amundsen/connection.py b/ingestion/src/metadata/ingestion/source/metadata/amundsen/connection.py
index 394834f4928a..8eabc792c96e 100644
--- a/ingestion/src/metadata/ingestion/source/metadata/amundsen/connection.py
+++ b/ingestion/src/metadata/ingestion/source/metadata/amundsen/connection.py
@@ -21,6 +21,9 @@
 from metadata.generated.schema.entity.services.connections.metadata.amundsenConnection import (
     AmundsenConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import (
     SourceConnectionException,
     test_connection_steps,
@@ -58,7 +61,7 @@ def test_connection(
     service_connection: AmundsenConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -68,7 +71,7 @@ def test_connection(
         "CheckAccess": partial(client.execute_query, query=NEO4J_AMUNDSEN_USER_QUERY)
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/metadata/amundsen/metadata.py b/ingestion/src/metadata/ingestion/source/metadata/amundsen/metadata.py
index a561aa7ab136..8c9d077e434d 100644
--- a/ingestion/src/metadata/ingestion/source/metadata/amundsen/metadata.py
+++ b/ingestion/src/metadata/ingestion/source/metadata/amundsen/metadata.py
@@ -56,6 +56,9 @@
 from metadata.ingestion.api.common import Entity
 from metadata.ingestion.api.models import Either
 from metadata.ingestion.api.steps import InvalidSourceException, Source
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.models.user import OMetaUserProfile
 from metadata.ingestion.ometa.client_utils import get_chart_entities_from_id
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
@@ -460,4 +463,7 @@ def get_database_service(self, service_name: str) -> DatabaseService:
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
diff --git a/ingestion/src/metadata/ingestion/source/metadata/atlas/connection.py b/ingestion/src/metadata/ingestion/source/metadata/atlas/connection.py
index a5218c666715..4a5f934a051b 100644
--- a/ingestion/src/metadata/ingestion/source/metadata/atlas/connection.py
+++ b/ingestion/src/metadata/ingestion/source/metadata/atlas/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.metadata.atlasConnection import (
     AtlasConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.metadata.atlas.client import AtlasClient
@@ -39,7 +42,7 @@ def test_connection(
     service_connection: AtlasConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -47,7 +50,7 @@ def test_connection(
 
     test_fn = {"CheckAccess": client.list_entities}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/metadata/atlas/metadata.py b/ingestion/src/metadata/ingestion/source/metadata/atlas/metadata.py
index 1f967e35a921..2711c5ca1469 100644
--- a/ingestion/src/metadata/ingestion/source/metadata/atlas/metadata.py
+++ b/ingestion/src/metadata/ingestion/source/metadata/atlas/metadata.py
@@ -41,6 +41,9 @@
 from metadata.generated.schema.type.entityReference import EntityReference
 from metadata.ingestion.api.models import Either, Entity, StackTraceError
 from metadata.ingestion.api.steps import InvalidSourceException, Source
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.models.ometa_classification import OMetaTagAndClassification
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.connections import get_connection, get_test_connection_fn
@@ -477,4 +480,7 @@ def get_lineage_entity_ref(
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
diff --git a/ingestion/src/metadata/ingestion/source/mlmodel/mlflow/connection.py b/ingestion/src/metadata/ingestion/source/mlmodel/mlflow/connection.py
index 335d4e4e4144..3957227936ad 100644
--- a/ingestion/src/metadata/ingestion/source/mlmodel/mlflow/connection.py
+++ b/ingestion/src/metadata/ingestion/source/mlmodel/mlflow/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.mlmodel.mlflowConnection import (
     MlflowConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -43,7 +46,7 @@ def test_connection(
     service_connection: MlflowConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -51,7 +54,7 @@ def test_connection(
 
     test_fn = {"GetModels": client.search_registered_models}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/mlmodel/mlmodel_service.py b/ingestion/src/metadata/ingestion/source/mlmodel/mlmodel_service.py
index f49baae8cf97..e9517f819895 100644
--- a/ingestion/src/metadata/ingestion/source/mlmodel/mlmodel_service.py
+++ b/ingestion/src/metadata/ingestion/source/mlmodel/mlmodel_service.py
@@ -38,6 +38,9 @@
 from metadata.ingestion.api.models import Either
 from metadata.ingestion.api.steps import Source
 from metadata.ingestion.api.topology_runner import TopologyRunnerMixin
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.models.delete_entity import DeleteEntity
 from metadata.ingestion.models.topology import (
     NodeStage,
@@ -176,7 +179,10 @@ def close(self):
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
 
     def mark_mlmodels_as_deleted(self) -> Iterable[Either[DeleteEntity]]:
         """Method to mark the mlmodels as deleted"""
diff --git a/ingestion/src/metadata/ingestion/source/mlmodel/sagemaker/connection.py b/ingestion/src/metadata/ingestion/source/mlmodel/sagemaker/connection.py
index 9c67e8f67ffb..ddf5f308e5e8 100644
--- a/ingestion/src/metadata/ingestion/source/mlmodel/sagemaker/connection.py
+++ b/ingestion/src/metadata/ingestion/source/mlmodel/sagemaker/connection.py
@@ -21,6 +21,9 @@
 from metadata.generated.schema.entity.services.connections.mlmodel.sageMakerConnection import (
     SageMakerConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -39,7 +42,7 @@ def test_connection(
     service_connection: SageMakerConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -47,7 +50,7 @@ def test_connection(
 
     test_fn = {"GetModels": client.list_models}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/airbyte/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/airbyte/connection.py
index d4387b78b931..03393d90fea1 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/airbyte/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/airbyte/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.airbyteConnection import (
     AirbyteConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.pipeline.airbyte.client import AirbyteClient
@@ -39,7 +42,7 @@ def test_connection(
     service_connection: AirbyteConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -47,7 +50,7 @@ def test_connection(
 
     test_fn = {"GetPipelines": client.list_workspaces}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/airflow/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/airflow/connection.py
index 2bf2a6786d61..70dacd993d54 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/airflow/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/airflow/connection.py
@@ -36,6 +36,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.backendConnection import (
     BackendConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import (
     SourceConnectionException,
     test_connection_engine_step,
@@ -105,7 +108,7 @@ def test_connection(
     service_connection: AirflowConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -113,7 +116,7 @@ def test_connection(
 
     test_fn = {"CheckAccess": partial(test_connection_engine_step, engine)}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/airflow/metadata.py b/ingestion/src/metadata/ingestion/source/pipeline/airflow/metadata.py
index 3d20858099c7..9e3bd5d7541b 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/airflow/metadata.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/airflow/metadata.py
@@ -15,7 +15,7 @@
 from collections import Counter
 from datetime import datetime
 from enum import Enum
-from typing import Iterable, List, Optional, cast
+from typing import Dict, Iterable, List, Optional, cast
 
 from airflow.models import BaseOperator, DagRun, TaskInstance
 from airflow.models.dag import DagModel
@@ -142,6 +142,16 @@ def session(self) -> Session:
 
         return self._session
 
+    @staticmethod
+    def _extract_serialized_task(task: Dict) -> Dict:
+        """
+        Given the serialization changes introduced in Airflow 2.10,
+        ensure compatibility with all versions.
+        """
+        if task.keys() == {"__var", "__type"}:
+            return task["__var"]
+        return task
+
     def get_pipeline_status(self, dag_id: str) -> List[DagRun]:
         """
         Return the DagRuns of given dag
@@ -328,7 +338,9 @@ def get_pipelines_list(self) -> Iterable[AirflowDagDetails]:
                     max_active_runs=data.get("max_active_runs", None),
                     description=data.get("_description", None),
                     start_date=data.get("start_date", None),
-                    tasks=data.get("tasks", []),
+                    tasks=list(
+                        map(self._extract_serialized_task, data.get("tasks", []))
+                    ),
                     schedule_interval=get_schedule_interval(data),
                     owner=self.fetch_dag_owners(data),
                 )
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/dagster/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/dagster/connection.py
index 9884e97060e8..b17564bd2fa1 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/dagster/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/dagster/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.dagsterConnection import (
     DagsterConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.pipeline.dagster.client import DagsterClient
@@ -40,7 +43,7 @@ def test_connection(
     service_connection: DagsterConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -51,7 +54,7 @@ def custom_executor_for_pipeline():
 
     test_fn = {"GetPipelines": custom_executor_for_pipeline}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/databrickspipeline/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/databrickspipeline/connection.py
index 6faf3e976a75..adbb9707ddcf 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/databrickspipeline/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/databrickspipeline/connection.py
@@ -21,6 +21,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.databricksPipelineConnection import (
     DatabricksPipelineConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.database.databricks.client import DatabricksClient
@@ -40,7 +43,7 @@ def test_connection(
     service_connection: DatabricksPipelineConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -48,7 +51,7 @@ def test_connection(
 
     test_fn = {"GetPipelines": client.list_jobs_test_connection}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/dbtcloud/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/dbtcloud/connection.py
index 992089be64f2..0c98d03bd84e 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/dbtcloud/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/dbtcloud/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.dbtCloudConnection import (
     DBTCloudConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.pipeline.dbtcloud.client import DBTCloudClient
@@ -41,7 +44,7 @@ def test_connection(
     service_connection: DBTCloudConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -54,7 +57,7 @@ def test_connection(
         "GetRuns": partial(client.get_runs, job_id=job_id),
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/domopipeline/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/domopipeline/connection.py
index 1ff928dd59c4..eed706734aeb 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/domopipeline/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/domopipeline/connection.py
@@ -24,6 +24,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.domoPipelineConnection import (
     DomoPipelineConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import (
     SourceConnectionException,
     test_connection_steps,
@@ -49,7 +52,7 @@ def test_connection(
     service_connection: DomoPipelineConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -61,7 +64,7 @@ def custom_executor():
 
     test_fn = {"GetPipelines": custom_executor}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/fivetran/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/fivetran/connection.py
index b60828feab48..5096b62f0268 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/fivetran/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/fivetran/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.fivetranConnection import (
     FivetranConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.pipeline.fivetran.client import FivetranClient
@@ -39,7 +42,7 @@ def test_connection(
     service_connection: FivetranConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -47,7 +50,7 @@ def test_connection(
 
     test_fn = {"GetPipelines": client.list_groups}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/flink/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/flink/connection.py
index a868ae01ddf5..a633b3096571 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/flink/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/flink/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.flinkConnection import (
     FlinkConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.pipeline.flink.client import FlinkClient
@@ -39,14 +42,14 @@ def test_connection(
     service_connection: FlinkConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
     """
     test_fn = {"GetPipelines": client.get_jobs}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/gluepipeline/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/gluepipeline/connection.py
index 222ed9a84ab0..b953934147b8 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/gluepipeline/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/gluepipeline/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.gluePipelineConnection import (
     GluePipelineConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -40,7 +43,7 @@ def test_connection(
     service_connection: GluePipelineConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -48,7 +51,7 @@ def test_connection(
 
     test_fn = {"GetPipelines": client.list_workflows}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/kafkaconnect/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/kafkaconnect/connection.py
index c8a3f4e87d94..38ea63920f0b 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/kafkaconnect/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/kafkaconnect/connection.py
@@ -21,6 +21,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.kafkaConnectConnection import (
     KafkaConnectConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.pipeline.kafkaconnect.client import KafkaConnectClient
@@ -40,7 +43,7 @@ def test_connection(
     service_connection: KafkaConnectConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -52,7 +55,7 @@ def test_connection(
         "GetPlugins": client.get_connector_plugins,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/nifi/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/nifi/connection.py
index 1b4b86e8cef0..097b8cc1dbb4 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/nifi/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/nifi/connection.py
@@ -21,6 +21,9 @@
     BasicAuthentication,
     NifiConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.pipeline.nifi.client import NifiClient
@@ -55,7 +58,7 @@ def test_connection(
     service_connection: NifiConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -66,7 +69,7 @@ def custom_executor():
 
     test_fn = {"GetPipelines": custom_executor}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/openlineage/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/openlineage/connection.py
index f578531672f5..ec7abe8b80a1 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/openlineage/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/openlineage/connection.py
@@ -26,6 +26,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.openLineageConnection import (
     SecurityProtocol as KafkaSecProtocol,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import (
     SourceConnectionException,
     test_connection_steps,
@@ -78,7 +81,7 @@ def test_connection(
     service_connection: OpenLineageConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -91,7 +94,7 @@ def custom_executor():
 
     test_fn = {"GetWatermarkOffsets": custom_executor}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/pipeline_service.py b/ingestion/src/metadata/ingestion/source/pipeline/pipeline_service.py
index 3df3712277a4..d9e8129aac91 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/pipeline_service.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/pipeline_service.py
@@ -35,6 +35,9 @@
 from metadata.ingestion.api.models import Either
 from metadata.ingestion.api.steps import Source
 from metadata.ingestion.api.topology_runner import TopologyRunnerMixin
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.models.delete_entity import DeleteEntity
 from metadata.ingestion.models.ometa_classification import OMetaTagAndClassification
 from metadata.ingestion.models.ometa_lineage import OMetaLineageRequest
@@ -251,7 +254,10 @@ def get_pipeline(self) -> Any:
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
 
     def register_record(self, pipeline_request: CreatePipelineRequest) -> None:
         """Mark the pipeline record as scanned and update the pipeline_source_state"""
diff --git a/ingestion/src/metadata/ingestion/source/pipeline/spline/connection.py b/ingestion/src/metadata/ingestion/source/pipeline/spline/connection.py
index 2b4d0dcfe8bd..acee709f941f 100644
--- a/ingestion/src/metadata/ingestion/source/pipeline/spline/connection.py
+++ b/ingestion/src/metadata/ingestion/source/pipeline/spline/connection.py
@@ -20,6 +20,9 @@
 from metadata.generated.schema.entity.services.connections.pipeline.splineConnection import (
     SplineConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.ingestion.source.pipeline.spline.client import SplineClient
@@ -40,7 +43,7 @@ def test_connection(
     service_connection: SplineConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -48,7 +51,7 @@ def test_connection(
 
     test_fn = {"GetPipelines": client.get_pipelines_test_connection}
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/search/elasticsearch/connection.py b/ingestion/src/metadata/ingestion/source/search/elasticsearch/connection.py
index dbd726756985..19c1b2e2c15a 100644
--- a/ingestion/src/metadata/ingestion/source/search/elasticsearch/connection.py
+++ b/ingestion/src/metadata/ingestion/source/search/elasticsearch/connection.py
@@ -40,6 +40,9 @@
 from metadata.generated.schema.entity.services.connections.search.elasticSearchConnection import (
     ElasticsearchConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.builders import init_empty_connection_arguments
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
@@ -186,7 +189,7 @@ def test_connection(
     service_connection: ElasticsearchConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -200,7 +203,7 @@ def test_get_search_indexes():
         "GetSearchIndexes": test_get_search_indexes,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/search/search_service.py b/ingestion/src/metadata/ingestion/source/search/search_service.py
index ce49c3245a1f..6bf2eaadd374 100644
--- a/ingestion/src/metadata/ingestion/source/search/search_service.py
+++ b/ingestion/src/metadata/ingestion/source/search/search_service.py
@@ -41,6 +41,9 @@
 from metadata.ingestion.api.models import Either
 from metadata.ingestion.api.steps import Source
 from metadata.ingestion.api.topology_runner import TopologyRunnerMixin
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.models.delete_entity import DeleteEntity
 from metadata.ingestion.models.search_index_data import OMetaIndexSampleData
 from metadata.ingestion.models.topology import (
@@ -192,7 +195,10 @@ def prepare(self):
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
 
     def mark_search_indexes_as_deleted(self) -> Iterable[Either[DeleteEntity]]:
         """Method to mark the search index as deleted"""
diff --git a/ingestion/src/metadata/ingestion/source/storage/gcs/connection.py b/ingestion/src/metadata/ingestion/source/storage/gcs/connection.py
index cafb53cdc159..5d1f78ade555 100644
--- a/ingestion/src/metadata/ingestion/source/storage/gcs/connection.py
+++ b/ingestion/src/metadata/ingestion/source/storage/gcs/connection.py
@@ -22,6 +22,9 @@
 from metadata.generated.schema.entity.services.connections.storage.gcsConnection import (
     GcsConnection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.generated.schema.security.credentials.gcpValues import (
     GcpCredentialsValues,
     SingleProjectId,
@@ -138,7 +141,7 @@ def test_connection(
     service_connection: GcsConnection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -153,7 +156,7 @@ def test_connection(
         "GetMetrics": tester.get_metrics,
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/storage/s3/connection.py b/ingestion/src/metadata/ingestion/source/storage/s3/connection.py
index 3c745dda162c..d2ba001b6ea9 100644
--- a/ingestion/src/metadata/ingestion/source/storage/s3/connection.py
+++ b/ingestion/src/metadata/ingestion/source/storage/s3/connection.py
@@ -27,6 +27,9 @@
 from metadata.generated.schema.entity.services.connections.storage.s3Connection import (
     S3Connection,
 )
+from metadata.generated.schema.entity.services.connections.testConnectionResult import (
+    TestConnectionResult,
+)
 from metadata.ingestion.connections.test_connections import test_connection_steps
 from metadata.ingestion.ometa.ometa_api import OpenMetadata
 from metadata.utils.constants import THREE_MIN
@@ -55,7 +58,7 @@ def test_connection(
     service_connection: S3Connection,
     automation_workflow: Optional[AutomationWorkflow] = None,
     timeout_seconds: Optional[int] = THREE_MIN,
-) -> None:
+) -> TestConnectionResult:
     """
     Test connection. This can be executed either as part
     of a metadata workflow or during an Automation Workflow
@@ -77,7 +80,7 @@ def test_buckets(connection: S3Connection, client: S3ObjectStoreClient):
         ),
     }
 
-    test_connection_steps(
+    return test_connection_steps(
         metadata=metadata,
         test_fn=test_fn,
         service_type=service_connection.type.value,
diff --git a/ingestion/src/metadata/ingestion/source/storage/storage_service.py b/ingestion/src/metadata/ingestion/source/storage/storage_service.py
index 5afb3b19b1d7..9a57e5231253 100644
--- a/ingestion/src/metadata/ingestion/source/storage/storage_service.py
+++ b/ingestion/src/metadata/ingestion/source/storage/storage_service.py
@@ -40,6 +40,9 @@
 from metadata.ingestion.api.models import Either
 from metadata.ingestion.api.steps import Source
 from metadata.ingestion.api.topology_runner import TopologyRunnerMixin
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.models.delete_entity import DeleteEntity
 from metadata.ingestion.models.ometa_classification import OMetaTagAndClassification
 from metadata.ingestion.models.topology import (
@@ -236,7 +239,10 @@ def register_record(self, container_request: CreateContainerRequest) -> None:
 
     def test_connection(self) -> None:
         test_connection_fn = get_test_connection_fn(self.service_connection)
-        test_connection_fn(self.metadata, self.connection_obj, self.service_connection)
+        result = test_connection_fn(
+            self.metadata, self.connection_obj, self.service_connection
+        )
+        raise_test_connection_exception(result)
 
     def mark_containers_as_deleted(self) -> Iterable[Either[DeleteEntity]]:
         """Method to mark the containers as deleted"""
diff --git a/ingestion/src/metadata/workflow/application.py b/ingestion/src/metadata/workflow/application.py
index 17ff06540705..b22d4b1bd789 100644
--- a/ingestion/src/metadata/workflow/application.py
+++ b/ingestion/src/metadata/workflow/application.py
@@ -78,23 +78,24 @@ class ApplicationWorkflow(BaseWorkflow, ABC):
     config: OpenMetadataApplicationConfig
     runner: Optional[AppRunner]
 
-    def __init__(self, config_dict: dict):
+    def __init__(self, config: OpenMetadataApplicationConfig):
         self.runner = None  # Will be passed in post-init
-        # TODO: Create a parse_gracefully method
-        self.config = OpenMetadataApplicationConfig.model_validate(config_dict)
+        self.config = config
 
         # Applications are associated to the OpenMetadata Service
         self.service_type: ServiceType = ServiceType.Metadata
 
         super().__init__(
             config=self.config,
-            workflow_config=self.workflow_config,
+            workflow_config=config.workflowConfig,
             service_type=self.service_type,
         )
 
     @classmethod
     def create(cls, config_dict: dict):
-        return cls(config_dict)
+        # TODO: Create a parse_gracefully method
+        config = OpenMetadataApplicationConfig.model_validate(config_dict)
+        return cls(config)
 
     def post_init(self) -> None:
         """
diff --git a/ingestion/src/metadata/workflow/profiler.py b/ingestion/src/metadata/workflow/profiler.py
index 4354b8c96bc7..5f8d692d2f20 100644
--- a/ingestion/src/metadata/workflow/profiler.py
+++ b/ingestion/src/metadata/workflow/profiler.py
@@ -20,6 +20,9 @@
     OpenMetadataWorkflowConfig,
 )
 from metadata.ingestion.api.steps import Processor, Sink
+from metadata.ingestion.connections.test_connections import (
+    raise_test_connection_exception,
+)
 from metadata.ingestion.source.connections import get_test_connection_fn
 from metadata.pii.processor import PIIProcessor
 from metadata.profiler.processor.processor import ProfilerProcessor
@@ -75,12 +78,13 @@ def set_steps(self):
         else:
             self.steps = (profiler_processor, sink)
 
-    def test_connection(self):
+    def test_connection(self) -> None:
         service_config = self.config.source.serviceConnection.root.config
         conn = get_ssl_connection(service_config)
 
         test_connection_fn = get_test_connection_fn(service_config)
-        test_connection_fn(self.metadata, conn, service_config)
+        result = test_connection_fn(self.metadata, conn, service_config)
+        raise_test_connection_exception(result)
 
     def _get_sink(self) -> Sink:
         sink_type = self.config.sink.type
diff --git a/ingestion/tests/unit/workflow/test_application_workflow.py b/ingestion/tests/unit/workflow/test_application_workflow.py
new file mode 100644
index 000000000000..df725f4d493f
--- /dev/null
+++ b/ingestion/tests/unit/workflow/test_application_workflow.py
@@ -0,0 +1,51 @@
+#  Copyright 2021 Collate
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#  http://www.apache.org/licenses/LICENSE-2.0
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""
+Validate the initialization of the App Workflow
+"""
+import yaml
+
+from metadata.workflow.application import ApplicationWorkflow, AppRunner
+
+
+class TestApp(AppRunner):
+    """Test App class"""
+
+    def close(self) -> None:
+        """I am a test"""
+
+    def run(self) -> None:
+        """I am a test"""
+
+
+def test_init_app() -> None:
+    """We can properly instantiate the app"""
+
+    config = f"""
+            sourcePythonClass: "{__name__}.TestApp"
+            appConfig:
+              type: Automator
+              resources:
+                type: [table]
+                queryFilter: "..."
+              actions:
+                - type: LineagePropagationAction
+                  overwriteMetadata: false
+            workflowConfig:
+              openMetadataServerConfig:
+                hostPort: "http://localhost:8585/api"
+                authProvider: "openmetadata"
+                securityConfig:
+                  jwtToken: "..."
+            """
+
+    workflow = ApplicationWorkflow.create(yaml.safe_load(config))
+    assert isinstance(workflow, ApplicationWorkflow)
diff --git a/openmetadata-docs/content/v1.4.x/deployment/bare-metal/index.md b/openmetadata-docs/content/v1.4.x/deployment/bare-metal/index.md
index f9bb71f11abe..05447310fd90 100644
--- a/openmetadata-docs/content/v1.4.x/deployment/bare-metal/index.md
+++ b/openmetadata-docs/content/v1.4.x/deployment/bare-metal/index.md
@@ -53,7 +53,7 @@ You can refer a sample script [here](https://github.com/open-metadata/OpenMetada
 
 ## Elasticsearch (version 8.X)
 
-OpenMetadata supports ElasticSearch version up to 8.10.2. To install or upgrade Elasticsearch to a supported version please see the instructions for your operating system at 
+OpenMetadata supports ElasticSearch version up to 8.11.4. To install or upgrade Elasticsearch to a supported version please see the instructions for your operating system at 
 [Installing ElasticSearch](https://www.elastic.co/guide/en/elasticsearch/reference/current/install-elasticsearch.html).
 
 Please follow the instructions here to [install ElasticSearch](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/setup.html).
@@ -169,7 +169,7 @@ If you are running OpenMetadata in AWS, it is recommended to use [Amazon RDS](ht
 We support 
 
 - Amazon RDS (MySQL) engine version 8 or higher
-- Amazon OpenSearch (ElasticSearch) engine version up to 8.10.2 or Amazon OpenSearch engine version up to 2.7
+- Amazon OpenSearch (ElasticSearch) engine version up to 8.11.4 or Amazon OpenSearch engine version up to 2.7
 - Amazon RDS (PostgreSQL) engine version between 12 or higher
 
 For Production Systems, we recommend Amazon RDS to be in Multiple Availability Zones. For Amazon OpenSearch (or ElasticSearch) Service, we recommend Multiple Availability Zones with minimum 3 Master Nodes.
diff --git a/openmetadata-docs/content/v1.4.x/deployment/docker/index.md b/openmetadata-docs/content/v1.4.x/deployment/docker/index.md
index 338a79dfb120..8b8f21bf7789 100644
--- a/openmetadata-docs/content/v1.4.x/deployment/docker/index.md
+++ b/openmetadata-docs/content/v1.4.x/deployment/docker/index.md
@@ -243,7 +243,7 @@ If you are running OpenMetadata in AWS, it is recommended to use [Amazon RDS](ht
 We support
 
 - Amazon RDS (MySQL) engine version 8 or higher
-- Amazon OpenSearch (ElasticSearch) engine version up to 8.10.2 or Amazon OpenSearch engine version up to 2.7
+- Amazon OpenSearch (ElasticSearch) engine version up to 8.11.4 or Amazon OpenSearch engine version up to 2.7
 - Amazon RDS (PostgreSQL) engine version 12 or higher
 
 Note:-
diff --git a/openmetadata-docs/content/v1.4.x/deployment/kubernetes/aks.md b/openmetadata-docs/content/v1.4.x/deployment/kubernetes/aks.md
index 7c606ecfd6c1..3e82e230511d 100644
--- a/openmetadata-docs/content/v1.4.x/deployment/kubernetes/aks.md
+++ b/openmetadata-docs/content/v1.4.x/deployment/kubernetes/aks.md
@@ -15,7 +15,7 @@ We support
 
 - Azure SQL (MySQL) engine version 8 or higher
 - Azure SQL (PostgreSQL) engine version 12 or higher
-- Elastic Cloud (ElasticSearch version 8.10.2)
+- Elastic Cloud (ElasticSearch version 8.11.4)
 
 Once you have the Azure SQL and Elastic Cloud on Azure configured, you can update the environment variables below for OpenMetadata kubernetes deployments to connect with Database and ElasticSearch.
 
diff --git a/openmetadata-docs/content/v1.4.x/deployment/kubernetes/on-prem.md b/openmetadata-docs/content/v1.4.x/deployment/kubernetes/on-prem.md
index ab84a05697f2..8751547ca565 100644
--- a/openmetadata-docs/content/v1.4.x/deployment/kubernetes/on-prem.md
+++ b/openmetadata-docs/content/v1.4.x/deployment/kubernetes/on-prem.md
@@ -22,7 +22,7 @@ We support
 
 - MySQL engine version 8 or higher
 - PostgreSQL engine version 12 or higher
-- ElasticSearch version 8.X (upto 8.10.2) or OpenSearch Version 2.X (upto 2.7)
+- ElasticSearch version 8.X (upto 8.11.4) or OpenSearch Version 2.X (upto 2.7)
 
 Once you have the External Database and Search Engine configured, you can update the environment variables below for OpenMetadata kubernetes deployments to connect with Database and ElasticSearch.
 
diff --git a/openmetadata-docs/content/v1.4.x/deployment/upgrade/versions/110-to-120.md b/openmetadata-docs/content/v1.4.x/deployment/upgrade/versions/110-to-120.md
index c4d742d006b5..2124ccc57a2a 100644
--- a/openmetadata-docs/content/v1.4.x/deployment/upgrade/versions/110-to-120.md
+++ b/openmetadata-docs/content/v1.4.x/deployment/upgrade/versions/110-to-120.md
@@ -160,7 +160,7 @@ For Kubernetes Deployment, `openmetadata.config.database.dbParams` is available
 ### Version Upgrades
 
 - The OpenMetadata Server is now based on **JDK 17**
-- OpenMetadata now **requires** **Elasticsearch** version **8.10.2** or **Opensearch** version **2.7**
+- OpenMetadata now **requires** **Elasticsearch** version **8.11.4** or **Opensearch** version **2.7**
 
 There is no direct migration to bump the indexes to the new supported versions. You might see errors like:
 
diff --git a/openmetadata-docs/content/v1.5.x/deployment/bare-metal/index.md b/openmetadata-docs/content/v1.5.x/deployment/bare-metal/index.md
index c993747ef63c..180b1a29c9d5 100644
--- a/openmetadata-docs/content/v1.5.x/deployment/bare-metal/index.md
+++ b/openmetadata-docs/content/v1.5.x/deployment/bare-metal/index.md
@@ -58,7 +58,7 @@ If you are facing an error `ERROR: could not compute MD5 hash: disabled for FIPS
 
 ## Elasticsearch (version 8.X)
 
-OpenMetadata supports ElasticSearch version up to 8.10.2. To install or upgrade Elasticsearch to a supported version please see the instructions for your operating system at 
+OpenMetadata supports ElasticSearch version up to 8.11.4. To install or upgrade Elasticsearch to a supported version please see the instructions for your operating system at 
 [Installing ElasticSearch](https://www.elastic.co/guide/en/elasticsearch/reference/current/install-elasticsearch.html).
 
 Please follow the instructions here to [install ElasticSearch](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/setup.html).
@@ -174,7 +174,7 @@ If you are running OpenMetadata in AWS, it is recommended to use [Amazon RDS](ht
 We support 
 
 - Amazon RDS (MySQL) engine version 8 or higher
-- Amazon OpenSearch (ElasticSearch) engine version up to 8.10.2 or Amazon OpenSearch engine version up to 2.7
+- Amazon OpenSearch (ElasticSearch) engine version up to 8.11.4 or Amazon OpenSearch engine version up to 2.7
 - Amazon RDS (PostgreSQL) engine version between 12 or higher
 
 For Production Systems, we recommend Amazon RDS to be in Multiple Availability Zones. For Amazon OpenSearch (or ElasticSearch) Service, we recommend Multiple Availability Zones with minimum 3 Master Nodes.
diff --git a/openmetadata-docs/content/v1.5.x/deployment/docker/index.md b/openmetadata-docs/content/v1.5.x/deployment/docker/index.md
index b5a8227e3645..0e3689962547 100644
--- a/openmetadata-docs/content/v1.5.x/deployment/docker/index.md
+++ b/openmetadata-docs/content/v1.5.x/deployment/docker/index.md
@@ -244,7 +244,7 @@ If you are running OpenMetadata in AWS, it is recommended to use [Amazon RDS](ht
 We support
 
 - Amazon RDS (MySQL) engine version 8 or higher
-- Amazon OpenSearch (ElasticSearch) engine version up to 8.10.2 or Amazon OpenSearch engine version up to 2.7
+- Amazon OpenSearch (ElasticSearch) engine version up to 8.11.4 or Amazon OpenSearch engine version up to 2.7
 - Amazon RDS (PostgreSQL) engine version 12 or higher
 
 Note:-
diff --git a/openmetadata-docs/content/v1.5.x/deployment/kubernetes/aks.md b/openmetadata-docs/content/v1.5.x/deployment/kubernetes/aks.md
index 5c4abeb5b242..39d3402c610b 100644
--- a/openmetadata-docs/content/v1.5.x/deployment/kubernetes/aks.md
+++ b/openmetadata-docs/content/v1.5.x/deployment/kubernetes/aks.md
@@ -16,7 +16,7 @@ We support
 
 - Azure SQL (MySQL) engine version 8 or higher
 - Azure SQL (PostgreSQL) engine version 12 or higher
-- Elastic Cloud (ElasticSearch version 8.10.2)
+- Elastic Cloud (ElasticSearch version 8.11.4)
 
 Once you have the Azure SQL and Elastic Cloud on Azure configured, you can update the environment variables below for OpenMetadata kubernetes deployments to connect with Database and ElasticSearch.
 
diff --git a/openmetadata-docs/content/v1.5.x/deployment/kubernetes/on-prem.md b/openmetadata-docs/content/v1.5.x/deployment/kubernetes/on-prem.md
index e231b1440d6d..ed0217709f4d 100644
--- a/openmetadata-docs/content/v1.5.x/deployment/kubernetes/on-prem.md
+++ b/openmetadata-docs/content/v1.5.x/deployment/kubernetes/on-prem.md
@@ -23,7 +23,7 @@ We support
 
 - MySQL engine version 8 or higher
 - PostgreSQL engine version 12 or higher
-- ElasticSearch version 8.X (upto 8.10.2) or OpenSearch Version 2.X (upto 2.7)
+- ElasticSearch version 8.X (upto 8.11.4) or OpenSearch Version 2.X (upto 2.7)
 
 Once you have the External Database and Search Engine configured, you can update the environment variables below for OpenMetadata kubernetes deployments to connect with Database and ElasticSearch.
 
diff --git a/openmetadata-docs/content/v1.5.x/deployment/upgrade/versions/110-to-120.md b/openmetadata-docs/content/v1.5.x/deployment/upgrade/versions/110-to-120.md
index b661db7eb18e..c8a61dba23a4 100644
--- a/openmetadata-docs/content/v1.5.x/deployment/upgrade/versions/110-to-120.md
+++ b/openmetadata-docs/content/v1.5.x/deployment/upgrade/versions/110-to-120.md
@@ -161,7 +161,7 @@ For Kubernetes Deployment, `openmetadata.config.database.dbParams` is available
 ### Version Upgrades
 
 - The OpenMetadata Server is now based on **JDK 17**
-- OpenMetadata now **requires** **Elasticsearch** version **8.10.2** or **Opensearch** version **2.7**
+- OpenMetadata now **requires** **Elasticsearch** version **8.11.4** or **Opensearch** version **2.7**
 
 There is no direct migration to bump the indexes to the new supported versions. You might see errors like:
 
diff --git a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/bare-metal/index.md b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/bare-metal/index.md
index 3df742a45630..0299492340f6 100644
--- a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/bare-metal/index.md
+++ b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/bare-metal/index.md
@@ -54,7 +54,7 @@ You can refer a sample script [here](https://github.com/open-metadata/OpenMetada
 
 ## Elasticsearch (version 8.X)
 
-OpenMetadata supports ElasticSearch version up to 8.10.2. To install or upgrade Elasticsearch to a supported version please see the instructions for your operating system at 
+OpenMetadata supports ElasticSearch version up to 8.11.4. To install or upgrade Elasticsearch to a supported version please see the instructions for your operating system at 
 [Installing ElasticSearch](https://www.elastic.co/guide/en/elasticsearch/reference/current/install-elasticsearch.html).
 
 Please follow the instructions here to [install ElasticSearch](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/setup.html).
@@ -170,7 +170,7 @@ If you are running OpenMetadata in AWS, it is recommended to use [Amazon RDS](ht
 We support 
 
 - Amazon RDS (MySQL) engine version 8 or higher
-- Amazon OpenSearch (ElasticSearch) engine version up to 8.10.2 or Amazon OpenSearch engine version up to 2.7
+- Amazon OpenSearch (ElasticSearch) engine version up to 8.11.4 or Amazon OpenSearch engine version up to 2.7
 - Amazon RDS (PostgreSQL) engine version between 12 or higher
 
 For Production Systems, we recommend Amazon RDS to be in Multiple Availability Zones. For Amazon OpenSearch (or ElasticSearch) Service, we recommend Multiple Availability Zones with minimum 3 Master Nodes.
diff --git a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/docker/index.md b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/docker/index.md
index b5a8227e3645..0e3689962547 100644
--- a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/docker/index.md
+++ b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/docker/index.md
@@ -244,7 +244,7 @@ If you are running OpenMetadata in AWS, it is recommended to use [Amazon RDS](ht
 We support
 
 - Amazon RDS (MySQL) engine version 8 or higher
-- Amazon OpenSearch (ElasticSearch) engine version up to 8.10.2 or Amazon OpenSearch engine version up to 2.7
+- Amazon OpenSearch (ElasticSearch) engine version up to 8.11.4 or Amazon OpenSearch engine version up to 2.7
 - Amazon RDS (PostgreSQL) engine version 12 or higher
 
 Note:-
diff --git a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/kubernetes/aks.md b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/kubernetes/aks.md
index 5c4abeb5b242..39d3402c610b 100644
--- a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/kubernetes/aks.md
+++ b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/kubernetes/aks.md
@@ -16,7 +16,7 @@ We support
 
 - Azure SQL (MySQL) engine version 8 or higher
 - Azure SQL (PostgreSQL) engine version 12 or higher
-- Elastic Cloud (ElasticSearch version 8.10.2)
+- Elastic Cloud (ElasticSearch version 8.11.4)
 
 Once you have the Azure SQL and Elastic Cloud on Azure configured, you can update the environment variables below for OpenMetadata kubernetes deployments to connect with Database and ElasticSearch.
 
diff --git a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/kubernetes/on-prem.md b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/kubernetes/on-prem.md
index e231b1440d6d..ed0217709f4d 100644
--- a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/kubernetes/on-prem.md
+++ b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/kubernetes/on-prem.md
@@ -23,7 +23,7 @@ We support
 
 - MySQL engine version 8 or higher
 - PostgreSQL engine version 12 or higher
-- ElasticSearch version 8.X (upto 8.10.2) or OpenSearch Version 2.X (upto 2.7)
+- ElasticSearch version 8.X (upto 8.11.4) or OpenSearch Version 2.X (upto 2.7)
 
 Once you have the External Database and Search Engine configured, you can update the environment variables below for OpenMetadata kubernetes deployments to connect with Database and ElasticSearch.
 
diff --git a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/upgrade/versions/110-to-120.md b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/upgrade/versions/110-to-120.md
index b661db7eb18e..c8a61dba23a4 100644
--- a/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/upgrade/versions/110-to-120.md
+++ b/openmetadata-docs/content/v1.6.x-SNAPSHOT/deployment/upgrade/versions/110-to-120.md
@@ -161,7 +161,7 @@ For Kubernetes Deployment, `openmetadata.config.database.dbParams` is available
 ### Version Upgrades
 
 - The OpenMetadata Server is now based on **JDK 17**
-- OpenMetadata now **requires** **Elasticsearch** version **8.10.2** or **Opensearch** version **2.7**
+- OpenMetadata now **requires** **Elasticsearch** version **8.11.4** or **Opensearch** version **2.7**
 
 There is no direct migration to bump the indexes to the new supported versions. You might see errors like:
 
diff --git a/openmetadata-service/pom.xml b/openmetadata-service/pom.xml
index 3a907a8ae6ea..2e5202fef329 100644
--- a/openmetadata-service/pom.xml
+++ b/openmetadata-service/pom.xml
@@ -710,7 +710,7 @@
                 <systemPropertyVariables>
                   <jdbcContainerClassName>org.testcontainers.containers.PostgreSQLContainer</jdbcContainerClassName>
                   <jdbcContainerImage>postgres:15</jdbcContainerImage>
-                  <elasticSearchContainerClassName>docker.elastic.co/elasticsearch/elasticsearch:8.10.2</elasticSearchContainerClassName>
+                  <elasticSearchContainerClassName>docker.elastic.co/elasticsearch/elasticsearch:8.11.4</elasticSearchContainerClassName>
                   <openSearchContainerClassName>opensearchproject/opensearch:2.7.0</openSearchContainerClassName>
                   <runESTestCases>false</runESTestCases>
                 </systemPropertyVariables>
@@ -750,7 +750,7 @@
                 <systemPropertyVariables>
                   <jdbcContainerClassName>org.testcontainers.containers.MySQLContainer</jdbcContainerClassName>
                   <jdbcContainerImage>mysql:8.3.0</jdbcContainerImage>
-                  <elasticSearchContainerClassName>docker.elastic.co/elasticsearch/elasticsearch:8.10.2</elasticSearchContainerClassName>
+                  <elasticSearchContainerClassName>docker.elastic.co/elasticsearch/elasticsearch:8.11.4</elasticSearchContainerClassName>
                   <openSearchContainerClassName>opensearchproject/opensearch:2.7.0</openSearchContainerClassName>
                   <runESTestCases>false</runESTestCases>
                 </systemPropertyVariables>
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/security/RBACConditionEvaluator.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/security/RBACConditionEvaluator.java
index 6bcb33bc8748..d61b9dfc206c 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/search/security/RBACConditionEvaluator.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/security/RBACConditionEvaluator.java
@@ -26,7 +26,7 @@ public class RBACConditionEvaluator {
   private final ExpressionParser spelParser = new SpelExpressionParser();
   private final StandardEvaluationContext spelContext;
   private static final Set<MetadataOperation> SEARCH_RELEVANT_OPS =
-      Set.of(MetadataOperation.VIEW_BASIC, MetadataOperation.VIEW_ALL);
+      Set.of(MetadataOperation.VIEW_BASIC, MetadataOperation.VIEW_ALL, MetadataOperation.ALL);
 
   public RBACConditionEvaluator(QueryBuilderFactory queryBuilderFactory) {
     this.queryBuilderFactory = queryBuilderFactory;
@@ -36,38 +36,99 @@ public RBACConditionEvaluator(QueryBuilderFactory queryBuilderFactory) {
   public OMQueryBuilder evaluateConditions(SubjectContext subjectContext) {
     User user = subjectContext.user();
     spelContext.setVariable("user", user);
-    ConditionCollector collector = new ConditionCollector(queryBuilderFactory);
+
+    ConditionCollector finalCollector = new ConditionCollector(queryBuilderFactory);
 
     for (Iterator<SubjectContext.PolicyContext> it =
             subjectContext.getPolicies(List.of(user.getEntityReference()));
         it.hasNext(); ) {
       SubjectContext.PolicyContext context = it.next();
+
+      ConditionCollector policyCollector = new ConditionCollector(queryBuilderFactory);
+      List<OMQueryBuilder> allowRuleQueries = new ArrayList<>();
+      List<OMQueryBuilder> denyRuleQueries = new ArrayList<>();
+
       for (CompiledRule rule : context.getRules()) {
-        if (rule.getCondition() != null
-            && rule.getOperations().stream().anyMatch(SEARCH_RELEVANT_OPS::contains)) {
-          ConditionCollector ruleCollector = new ConditionCollector(queryBuilderFactory);
-          if (!rule.getResources().isEmpty() && !rule.getResources().contains("All")) {
-            OMQueryBuilder indexFilter = getIndexFilter(rule.getResources());
-            ruleCollector.addMust(indexFilter);
-          }
-          SpelExpression parsedExpression =
-              (SpelExpression) spelParser.parseExpression(rule.getCondition());
-          preprocessExpression(parsedExpression.getAST(), ruleCollector);
-          OMQueryBuilder ruleQuery = ruleCollector.buildFinalQuery();
-          if (rule.getEffect().toString().equalsIgnoreCase("DENY")) {
-            collector.addMustNot(ruleQuery);
-          } else {
-            collector.addMust(ruleQuery);
-          }
+        boolean isDenyRule = rule.getEffect().toString().equalsIgnoreCase("DENY");
+        List<MetadataOperation> mappedOperations =
+            rule.getOperations().stream()
+                .map(
+                    op -> {
+                      if (op.toString().equalsIgnoreCase("Create")
+                          || op.toString().equalsIgnoreCase("Delete")
+                          || op.toString().toLowerCase().startsWith("edit")) {
+                        return MetadataOperation.VIEW_BASIC;
+                      }
+                      return op;
+                    })
+                .collect(Collectors.toList());
+
+        if (isDenyRule && SEARCH_RELEVANT_OPS.stream().noneMatch(mappedOperations::contains)) {
+          continue;
+        }
+
+        OMQueryBuilder ruleQuery = buildRuleQuery(rule, user);
+        if (ruleQuery == null || ruleQuery.isEmpty()) {
+          continue;
+        }
+        if (isDenyRule) {
+          denyRuleQueries.add(ruleQuery);
+        } else {
+          allowRuleQueries.add(ruleQuery);
         }
       }
+
+      if (!denyRuleQueries.isEmpty()) {
+        if (denyRuleQueries.size() == 1) {
+          policyCollector.addMustNot(denyRuleQueries.get(0));
+        } else {
+          OMQueryBuilder denyQuery = queryBuilderFactory.boolQuery().should(denyRuleQueries);
+          policyCollector.addMustNot(denyQuery);
+        }
+      }
+
+      if (!allowRuleQueries.isEmpty()) {
+        if (allowRuleQueries.size() == 1) {
+          policyCollector.addMust(allowRuleQueries.get(0));
+        } else {
+          OMQueryBuilder allowQuery = queryBuilderFactory.boolQuery().should(allowRuleQueries);
+          policyCollector.addMust(allowQuery);
+        }
+      } else {
+        policyCollector.addMust(queryBuilderFactory.matchAllQuery());
+      }
+
+      OMQueryBuilder policyFinalQuery = policyCollector.buildFinalQuery();
+      if (policyFinalQuery != null && !policyFinalQuery.isEmpty()) {
+        finalCollector.addMust(policyFinalQuery);
+      }
     }
 
-    return collector.buildFinalQuery();
+    return finalCollector.buildFinalQuery();
+  }
+
+  private OMQueryBuilder buildRuleQuery(CompiledRule rule, User user) {
+    ConditionCollector ruleCollector = new ConditionCollector(queryBuilderFactory);
+    spelContext.setVariable("user", user);
+
+    // Apply index filtering if resources are specified and not "All"
+    if (!rule.getResources().isEmpty() && !rule.getResources().contains("All")) {
+      OMQueryBuilder indexFilter = getIndexFilter(rule.getResources());
+      ruleCollector.addMust(indexFilter);
+    }
+
+    if (rule.getCondition() != null && !rule.getCondition().trim().isEmpty()) {
+      SpelExpression parsedExpression =
+          (SpelExpression) spelParser.parseExpression(rule.getCondition());
+      preprocessExpression(parsedExpression.getAST(), ruleCollector);
+    } else {
+      ruleCollector.addMust(queryBuilderFactory.matchAllQuery());
+    }
+
+    return ruleCollector.buildFinalQuery();
   }
 
   private void preprocessExpression(SpelNode node, ConditionCollector collector) {
-    // Delay this check until after processing necessary expressions
     if (collector.isMatchNothing()) {
       return;
     }
@@ -82,35 +143,33 @@ private void preprocessExpression(SpelNode node, ConditionCollector collector) {
     } else if (node instanceof OpOr) {
       List<OMQueryBuilder> orQueries = new ArrayList<>();
       boolean allMatchNothing = true;
-      boolean hasTrueCondition = false; // Track if any condition evaluated to true
+      boolean hasTrueCondition = false;
 
       for (int i = 0; i < node.getChildCount(); i++) {
         ConditionCollector childCollector = new ConditionCollector(queryBuilderFactory);
         preprocessExpression(node.getChild(i), childCollector);
 
         if (childCollector.isMatchNothing()) {
-          continue; // If this child evaluates to match nothing, skip it
+          continue;
         }
 
         if (childCollector.isMatchAllQuery()) {
-          hasTrueCondition = true; // If any condition evaluates to true, mark it
-          break; // Short-circuit: if any condition in OR evaluates to true, the whole OR is true
+          hasTrueCondition = true;
+          break;
         }
 
         OMQueryBuilder childQuery = childCollector.buildFinalQuery();
         if (childQuery != null) {
-          allMatchNothing =
-              false; // If at least one child query is valid, it’s not all match nothing
+          allMatchNothing = false;
           orQueries.add(childQuery);
         }
       }
 
       if (hasTrueCondition) {
-        collector.addMust(queryBuilderFactory.matchAllQuery()); // OR is true, add match_all
+        collector.addMust(queryBuilderFactory.matchAllQuery());
       } else if (allMatchNothing) {
-        collector.setMatchNothing(true); // OR is false
+        collector.setMatchNothing(true);
       } else {
-        // Add the valid OR queries to the collector
         for (OMQueryBuilder orQuery : orQueries) {
           collector.addShould(orQuery);
         }
@@ -126,7 +185,7 @@ private void preprocessExpression(SpelNode node, ConditionCollector collector) {
       } else {
         OMQueryBuilder subQuery = subCollector.buildFinalQuery();
         if (subQuery != null && !subQuery.isEmpty()) {
-          collector.addMustNot(subQuery); // Add must_not without extra nesting
+          collector.addMustNot(subQuery);
         }
       }
     } else if (node instanceof MethodReference) {
@@ -165,7 +224,7 @@ private List<String> extractMethodArguments(MethodReference methodRef) {
     List<String> args = new ArrayList<>();
     for (int i = 0; i < methodRef.getChildCount(); i++) {
       SpelNode childNode = methodRef.getChild(i);
-      String value = childNode.toStringAST().replace("'", ""); // Remove single quotes
+      String value = childNode.toStringAST().replace("'", "");
       args.add(value);
     }
     return args;
@@ -181,27 +240,27 @@ public void matchAnyTag(List<String> tags, ConditionCollector collector) {
   public void matchAllTags(List<String> tags, ConditionCollector collector) {
     for (String tag : tags) {
       OMQueryBuilder tagQuery = queryBuilderFactory.termQuery("tags.tagFQN", tag);
-      collector.addMust(tagQuery); // Add directly to the collector's must clause
+      collector.addMust(tagQuery);
     }
   }
 
   public void isOwner(User user, ConditionCollector collector) {
     List<OMQueryBuilder> ownerQueries = new ArrayList<>();
-    ownerQueries.add(queryBuilderFactory.termQuery("owner.id", user.getId().toString()));
+    ownerQueries.add(queryBuilderFactory.termQuery("owners.id", user.getId().toString()));
 
     if (user.getTeams() != null) {
       for (EntityReference team : user.getTeams()) {
-        ownerQueries.add(queryBuilderFactory.termQuery("owner.id", team.getId().toString()));
+        ownerQueries.add(queryBuilderFactory.termQuery("owners.id", team.getId().toString()));
       }
     }
 
     for (OMQueryBuilder ownerQuery : ownerQueries) {
-      collector.addShould(ownerQuery); // Add directly to the collector's should clause
+      collector.addShould(ownerQuery);
     }
   }
 
   public void noOwner(ConditionCollector collector) {
-    OMQueryBuilder existsQuery = queryBuilderFactory.existsQuery("owner.id");
+    OMQueryBuilder existsQuery = queryBuilderFactory.existsQuery("owners.id");
     collector.addMustNot(existsQuery);
   }
 
@@ -253,7 +312,7 @@ private OMQueryBuilder getIndexFilter(List<String> resources) {
     List<String> indices =
         resources.stream()
             .map(resource -> Entity.getSearchRepository().getIndexOrAliasName(resource))
-            .collect(Collectors.toList());
+            .toList();
 
     return queryBuilderFactory.termsQuery("_index", indices);
   }
diff --git a/openmetadata-service/src/main/resources/json/data/policy/OrganizationPolicy.json b/openmetadata-service/src/main/resources/json/data/policy/OrganizationPolicy.json
index 3ad245e38b54..5036e370e015 100644
--- a/openmetadata-service/src/main/resources/json/data/policy/OrganizationPolicy.json
+++ b/openmetadata-service/src/main/resources/json/data/policy/OrganizationPolicy.json
@@ -22,6 +22,13 @@
       "operations": ["EditOwners"],
       "effect": "allow",
       "condition": "noOwner()"
+    },
+    {
+      "name": "OrganizationPolicy-ViewAll-Rule",
+      "description" : "Allow all users to discover data assets.",
+      "resources" : ["all"],
+      "operations": ["ViewAll"],
+      "effect": "allow"
     }
   ]
 }
\ No newline at end of file
diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java
index 83eaa7add77e..ba7cb071a669 100644
--- a/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java
+++ b/openmetadata-service/src/test/java/org/openmetadata/service/OpenMetadataApplicationTest.java
@@ -99,7 +99,7 @@ public abstract class OpenMetadataApplicationTest {
       "org.testcontainers.containers.MySQLContainer";
   private static final String JDBC_CONTAINER_IMAGE = "mysql:8";
   private static final String ELASTIC_SEARCH_CONTAINER_IMAGE =
-      "docker.elastic.co/elasticsearch/elasticsearch:8.10.2";
+      "docker.elastic.co/elasticsearch/elasticsearch:8.11.4";
 
   private static String HOST;
   private static String PORT;
diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/search/security/ElasticSearchRBACConditionEvaluatorTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/search/security/ElasticSearchRBACConditionEvaluatorTest.java
index 30da785f07d6..a7a015b6e160 100644
--- a/openmetadata-service/src/test/java/org/openmetadata/service/search/security/ElasticSearchRBACConditionEvaluatorTest.java
+++ b/openmetadata-service/src/test/java/org/openmetadata/service/search/security/ElasticSearchRBACConditionEvaluatorTest.java
@@ -2,7 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
@@ -16,7 +15,11 @@
 import es.org.elasticsearch.index.query.QueryBuilder;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.jupiter.api.AfterEach;
@@ -55,6 +58,14 @@ public void setUp() {
               return resource.toLowerCase();
             });
     Entity.setSearchRepository(mockSearchRepository);
+    mockSubjectContext = mock(SubjectContext.class);
+    mockUser = mock(User.class);
+    EntityReference mockUserReference = mock(EntityReference.class);
+    when(mockUser.getEntityReference()).thenReturn(mockUserReference);
+    when(mockUserReference.getId()).thenReturn(UUID.randomUUID());
+    when(mockUser.getId()).thenReturn(UUID.randomUUID());
+    when(mockUser.getName()).thenReturn("testUser");
+    when(mockSubjectContext.user()).thenReturn(mockUser);
   }
 
   @AfterEach
@@ -67,26 +78,15 @@ private void setupMockPolicies(
       String effect,
       List<List<String>> resourcesList,
       List<List<MetadataOperation>> operationsList) {
-    // Mock the user
-    mockUser = mock(User.class);
-    EntityReference mockUserReference = mock(EntityReference.class);
-    when(mockUser.getEntityReference()).thenReturn(mockUserReference);
-    when(mockUserReference.getId()).thenReturn(UUID.randomUUID());
-    when(mockUser.getId()).thenReturn(UUID.randomUUID());
-    when(mockUser.getName()).thenReturn("testUser");
 
-    // Mock the policy context
     SubjectContext.PolicyContext mockPolicyContext = mock(SubjectContext.PolicyContext.class);
     when(mockPolicyContext.getPolicyName()).thenReturn("TestPolicy");
 
-    // Create a list of mock rules
     List<CompiledRule> mockRules = new ArrayList<>();
     for (int i = 0; i < expressions.size(); i++) {
       CompiledRule mockRule = mock(CompiledRule.class);
       when(mockRule.getOperations()).thenReturn(List.of(MetadataOperation.VIEW_BASIC));
       when(mockRule.getCondition()).thenReturn(expressions.get(i));
-
-      // Use resources from the corresponding index in resourcesList
       List<String> resources = (resourcesList.size() > i) ? resourcesList.get(i) : List.of("All");
       when(mockRule.getResources()).thenReturn(resources);
 
@@ -100,11 +100,7 @@ private void setupMockPolicies(
     }
 
     when(mockPolicyContext.getRules()).thenReturn(mockRules);
-
-    // Mock the subject context with this policy
-    mockSubjectContext = mock(SubjectContext.class);
     when(mockSubjectContext.getPolicies(any())).thenReturn(List.of(mockPolicyContext).iterator());
-    when(mockSubjectContext.user()).thenReturn(mockUser);
   }
 
   private void setupMockPolicies(String expression, String effect, List<String> resources) {
@@ -127,7 +123,7 @@ void testIsOwner() {
     QueryBuilder elasticQuery = ((ElasticQueryBuilder) finalQuery).build();
     String generatedQuery = elasticQuery.toString();
 
-    assertTrue(generatedQuery.contains("owner.id"), "The query should contain 'owner.id'.");
+    assertTrue(generatedQuery.contains("owners.id"), "The query should contain 'owners.id'.");
     assertTrue(
         generatedQuery.contains(mockUser.getId().toString()),
         "The query should contain the user's ID.");
@@ -144,8 +140,8 @@ void testNegationWithIsOwner() {
     assertTrue(
         generatedQuery.contains("must_not"), "The query should contain 'must_not' for negation.");
     assertTrue(
-        generatedQuery.contains("owner.id"),
-        "The query should contain 'owner.id' in the negation.");
+        generatedQuery.contains("owners.id"),
+        "The query should contain 'owners.id' in the negation.");
     assertTrue(
         generatedQuery.contains(mockUser.getId().toString()),
         "The negation should contain the user's ID.");
@@ -182,7 +178,7 @@ void testComplexCondition() {
         generatedQuery.contains("PII.Sensitive"), "The query should contain 'PII.Sensitive' tag.");
     assertTrue(generatedQuery.contains("Test.Test1"), "The query should contain 'Test.Test1' tag.");
     assertTrue(generatedQuery.contains("Test.Test2"), "The query should contain 'Test.Test2' tag.");
-    assertTrue(generatedQuery.contains("owner.id"), "The query should contain 'owner.id'.");
+    assertTrue(generatedQuery.contains("owners.id"), "The query should contain 'owners.id'.");
 
     assertTrue(
         generatedQuery.contains("must_not"), "The query should contain a negation (must_not).");
@@ -221,13 +217,13 @@ void testComplexQueryStructure() throws IOException {
     // Check for the presence of owner.id in the "must_not" clause for the negation
     assertFieldExists(
         jsonContext,
-        "$.bool.should[2].bool.must_not[0].bool.should[?(@.term['owner.id'])]",
-        "owner.id in must_not");
+        "$.bool.should[2].bool.must_not[0].bool.should[?(@.term['owners.id'])]",
+        "owners.id in must_not");
 
     // Check for the presence of must_not for the case where there is no owner
     assertFieldExists(
         jsonContext,
-        "$.bool.should[3].bool.must_not[?(@.exists.field=='owner.id')]",
+        "$.bool.should[3].bool.must_not[?(@.exists.field=='owners.id')]",
         "no owner must_not clause");
 
     // Count the number of bool clauses
@@ -388,7 +384,7 @@ void testConditionUserLacksDomain() {
     // Check for owner ID and Public tag in the query
     assertFieldExists(
         jsonContext,
-        "$.bool.should[?(@.term['owner.id'].value=='" + mockUser.getId().toString() + "')]",
+        "$.bool.should[?(@.term['owners.id'].value=='" + mockUser.getId().toString() + "')]",
         "owner.id");
     assertFieldExists(
         jsonContext, "$.bool.should[?(@.term['tags.tagFQN'].value=='Public')]", "Public tag");
@@ -415,7 +411,7 @@ void testNestedLogicalOperators() {
 
     assertTrue(generatedQuery.contains("tags.tagFQN"), "The query should contain 'tags.tagFQN'.");
     assertTrue(generatedQuery.contains("Sensitive"), "The query should contain 'Sensitive' tag.");
-    assertTrue(generatedQuery.contains("owner.id"), "The query should contain 'owner.id'.");
+    assertTrue(generatedQuery.contains("owners.id"), "The query should contain 'owners.id'.");
     assertFalse(generatedQuery.contains("match_none"), "The query should not be match_none.");
   }
 
@@ -476,7 +472,7 @@ void testComplexNestedConditions() {
 
     // Ensure that the query does not check for noOwner since inAnyTeam('HR') is false
     assertFieldDoesNotExist(
-        jsonContext, "$.bool.must_not[?(@.exists.field=='owner.id')]", "noOwner clause");
+        jsonContext, "$.bool.must_not[?(@.exists.field=='owners.id')]", "noOwner clause");
 
     // Ensure the query does not contain a match_none condition
     assertFieldDoesNotExist(jsonContext, "$.bool[?(@.match_none)]", "match_none");
@@ -505,8 +501,8 @@ void testMultipleNestedNotOperators() {
         "Internal");
     assertFieldExists(
         jsonContext,
-        "$.bool.must_not[0].bool.should[1].bool.should[?(@.term['owner.id'])]",
-        "owner.id");
+        "$.bool.must_not[0].bool.should[1].bool.should[?(@.term['owners.id'])]",
+        "owners.id");
   }
 
   @Test
@@ -573,7 +569,7 @@ void testNestedAndOrWithMultipleMethods() {
     assertTrue(
         generatedQuery.contains("\"domain.id\""), "The query should contain 'domain.id' term.");
     assertTrue(
-        generatedQuery.contains("\"owner.id\""), "The query should contain 'owner.id' term.");
+        generatedQuery.contains("\"owners.id\""), "The query should contain 'owners.id' term.");
     assertFalse(
         generatedQuery.contains("\"must_not\" : [ { \"exists\""),
         "The query should not contain 'must_not' clause for 'noOwner()'.");
@@ -634,7 +630,7 @@ void testComplexConditionWithAllMethods() {
 
     // Check for the presence of owner.id in the second should block
     assertFieldExists(
-        jsonContext, "$.bool.should[1].bool.should[?(@.term['owner.id'])]", "owner.id");
+        jsonContext, "$.bool.should[1].bool.should[?(@.term['owners.id'])]", "owners.id");
   }
 
   @Test
@@ -740,7 +736,7 @@ void testComplexConditionWithMultipleNegations() {
         "Confidential");
 
     // Ownership (isOwner condition) should be in `should`
-    assertFieldExists(jsonContext, "$.bool.should[?(@.term['owner.id'])]", "owner.id");
+    assertFieldExists(jsonContext, "$.bool.should[?(@.term['owners.id'])]", "owners.id");
   }
 
   @Test
@@ -761,8 +757,8 @@ void testNotHasDomainWhenUserHasNoDomain() {
         "must_not for hasDomain");
     assertFieldExists(
         jsonContext,
-        "$.bool.should[?(@.term['owner.id'].value=='" + mockUser.getId().toString() + "')]",
-        "owner.id");
+        "$.bool.should[?(@.term['owners.id'].value=='" + mockUser.getId().toString() + "')]",
+        "owners.id");
     assertFieldDoesNotExist(jsonContext, "$.bool[?(@.match_none)]", "match_none should not exist");
   }
 
@@ -861,33 +857,33 @@ void testMultipleRulesInPolicy() {
     // Check for the "Table" index condition
     assertFieldExists(
         jsonContext,
-        "$.bool.must[0].bool.must[?(@.terms._index && @.terms._index[?(@ == 'table')])]",
+        "$.bool.should[0].bool.must[?(@.terms._index && @.terms._index[?(@ == 'table')])]",
         "Index filtering for 'Table' resource");
     assertFieldExists(
         jsonContext,
-        "$.bool.must[0].bool.must[?(@.match_all)]",
+        "$.bool.should[0].bool.must[?(@.match_all)]",
         "match_all for hasAnyRole 'Admin'");
     assertFieldExists(
         jsonContext,
-        "$.bool.must[0].bool.should[?(@.term['tags.tagFQN'].value=='Sensitive')]",
+        "$.bool.should[0].bool.should[?(@.term['tags.tagFQN'].value=='Sensitive')]",
         "Sensitive tag");
 
     // Check for the "Dashboard" index condition
     assertFieldExists(
         jsonContext,
-        "$.bool.must[1].bool.must[?(@.terms._index && @.terms._index[?(@ == 'database')])]",
+        "$.bool.should[1].bool.must[?(@.terms._index && @.terms._index[?(@ == 'database')])]",
         "Index filtering for 'Database' resource");
     assertFieldExists(
         jsonContext,
-        "$.bool.must[1].bool.must[?(@.match_all)]",
+        "$.bool.should[1].bool.must[?(@.match_all)]",
         "match_all for inAnyTeam 'Engineering'");
     assertFieldExists(
         jsonContext,
-        "$.bool.must[1].bool.must[?(@.term['tags.tagFQN'].value=='Confidential')]",
+        "$.bool.should[1].bool.must[?(@.term['tags.tagFQN'].value=='Confidential')]",
         "Confidential tag");
     assertFieldExists(
         jsonContext,
-        "$.bool.must[1].bool.must[?(@.term['tags.tagFQN'].value=='Internal')]",
+        "$.bool.should[1].bool.must[?(@.term['tags.tagFQN'].value=='Internal')]",
         "Internal tag");
   }
 
@@ -929,7 +925,7 @@ void testMultiplePoliciesInRole() {
     // Check for domain filtering in the "Table" index clause
     assertFieldExists(
         jsonContext,
-        "$.bool.must[0].bool.must[?(@.term['domain.id'].value=='"
+        "$.bool.should[0].bool.must[?(@.term['domain.id'].value=='"
             + domain.getId().toString()
             + "')]",
         "user's domain ID");
@@ -937,7 +933,7 @@ void testMultiplePoliciesInRole() {
     // Check for the matchAnyTag clause for Public tag in the "Table" index clause
     assertFieldExists(
         jsonContext,
-        "$.bool.must[0].bool.should[?(@.term['tags.tagFQN'].value=='Public')]",
+        "$.bool.should[0].bool.should[?(@.term['tags.tagFQN'].value=='Public')]",
         "Public tag");
   }
 
@@ -979,7 +975,7 @@ void testRoleAndPolicyInheritanceFromTeams() {
     // Adjust the assertion for the hasDomain clause
     assertFieldExists(
         jsonContext,
-        "$.bool.must[0].bool.must[?(@.term['domain.id'].value=='"
+        "$.bool.should[0].bool.must[?(@.term['domain.id'].value=='"
             + domain.getId().toString()
             + "')]",
         "user's domain ID");
@@ -987,13 +983,13 @@ void testRoleAndPolicyInheritanceFromTeams() {
     // Check for the inAnyTeam('Engineering') clause
     assertFieldExists(
         jsonContext,
-        "$.bool.must[1].bool.must[?(@.match_all)]",
+        "$.bool.should[1].bool.must[?(@.match_all)]",
         "match_all for inAnyTeam 'Engineering'");
 
     // Check for the matchAnyTag clause for Critical tag
     assertFieldExists(
         jsonContext,
-        "$.bool.must[1].bool.should[?(@.term['tags.tagFQN'].value=='Critical')]",
+        "$.bool.should[1].bool.should[?(@.term['tags.tagFQN'].value=='Critical')]",
         "Critical tag");
   }
 
@@ -1007,11 +1003,16 @@ void testRuleWithNonViewOperationIgnored() {
         List.of(List.of(MetadataOperation.EDIT_DESCRIPTION)));
 
     // Mock user ownership
-    when(mockUser.getId()).thenReturn(UUID.randomUUID());
+    UUID userId = UUID.randomUUID();
+    when(mockUser.getId()).thenReturn(userId);
 
     // Evaluate the condition
     OMQueryBuilder finalQuery = evaluator.evaluateConditions(mockSubjectContext);
-    assertNull(finalQuery, "The query should be null since the rule is ignored");
+    QueryBuilder elasticQuery = ((ElasticQueryBuilder) finalQuery).build();
+    String generatedQuery = elasticQuery.toString();
+    assertTrue(generatedQuery.contains("owners.id"), "The query should contain 'owner.id'");
+    assertTrue(
+        generatedQuery.contains(userId.toString()), "The query should contain the user's ID");
   }
 
   @Test
@@ -1033,8 +1034,203 @@ void testRuleWithViewBasicOperationApplied() {
     String generatedQuery = elasticQuery.toString();
 
     // The rule should affect the search query
-    assertTrue(generatedQuery.contains("owner.id"), "The query should contain 'owner.id'");
+    assertTrue(generatedQuery.contains("owners.id"), "The query should contain 'owner.id'");
     assertTrue(
         generatedQuery.contains(userId.toString()), "The query should contain the user's ID");
   }
+
+  @Test
+  void testDenyAllOperationsOnTableResource() {
+    setupMockPolicies(
+        List.of(""), "DENY", List.of(List.of("Table")), List.of(List.of(MetadataOperation.ALL)));
+
+    UUID userId = UUID.randomUUID();
+    when(mockUser.getId()).thenReturn(userId);
+
+    OMQueryBuilder finalQuery = evaluator.evaluateConditions(mockSubjectContext);
+    QueryBuilder elasticQuery = ((ElasticQueryBuilder) finalQuery).build();
+    String generatedQuery = elasticQuery.toString();
+    DocumentContext jsonContext = JsonPath.parse(generatedQuery);
+
+    assertFieldExists(
+        jsonContext,
+        "$.bool.must_not[0].bool.must[?(@.terms._index && @.terms._index[?(@ == 'table')])]",
+        "must_not clause excluding 'table'");
+
+    // Assertions to ensure 'table' is not included in 'must' or 'should' clauses
+    assertFieldDoesNotExist(
+        jsonContext,
+        "$.bool.must[?(@.terms._index && @.terms._index[?(@ == 'table')])]",
+        "'table' should not be included in must clauses");
+    assertFieldDoesNotExist(
+        jsonContext,
+        "$.bool.should[?(@.terms._index && @.terms._index[?(@ == 'table')])]",
+        "'table' should not be included in should clauses");
+  }
+
+  @Test
+  void testUserSeesOwnedAndUnownedResourcesIncludingTeamOwnership() {
+    // Set up a policy with three rules
+    setupMockPolicies(
+        List.of(
+            "noOwner()", // Rule 1 condition (ViewBasic)
+            "isOwner()" // Rule 2 condition (All operations)
+            ),
+        "ALLOW",
+        List.of(
+            List.of("All"), // Rule 1 resources
+            List.of("All") // Rule 2 resources
+            ),
+        List.of(List.of(MetadataOperation.EDIT_OWNERS), List.of(MetadataOperation.ALL)));
+
+    UUID userId = UUID.randomUUID();
+    when(mockUser.getId()).thenReturn(userId);
+
+    UUID teamId1 = UUID.randomUUID();
+    UUID teamId2 = UUID.randomUUID();
+    EntityReference team1 = new EntityReference();
+    team1.setId(teamId1);
+    team1.setName("TeamA");
+
+    EntityReference team2 = new EntityReference();
+    team2.setId(teamId2);
+    team2.setName("TeamB");
+
+    when(mockUser.getTeams()).thenReturn(List.of(team1, team2));
+
+    OMQueryBuilder finalQuery = evaluator.evaluateConditions(mockSubjectContext);
+    QueryBuilder elasticQuery = ((ElasticQueryBuilder) finalQuery).build();
+    String generatedQuery = elasticQuery.toString();
+    DocumentContext jsonContext = JsonPath.parse(generatedQuery);
+
+    assertFieldExists(
+        jsonContext,
+        "$.bool.should[1].bool.should[?(@.term['owners.id'].value=='" + userId.toString() + "')]",
+        "The query should allow resources where the user is the owner");
+
+    assertFieldExists(
+        jsonContext,
+        "$.bool.should[1].bool.should[?(@.term['owners.id'].value=='" + teamId1.toString() + "')]",
+        "The query should allow resources where TeamA is the owner");
+    assertFieldExists(
+        jsonContext,
+        "$.bool.should[1].bool.should[?(@.term['owners.id'].value=='" + teamId2.toString() + "')]",
+        "The query should allow resources where TeamB is the owner");
+
+    assertFalse(
+        generatedQuery.contains("noOwner()"),
+        "The query should not contain 'noOwner()' as a string");
+  }
+
+  @Test
+  void testPoliciesProcessing() {
+    List<CompiledRule> compiledRules = new ArrayList<>();
+    List<Map<String, Object>> policies = getPolicies();
+
+    for (Map<String, Object> policy : policies) {
+      CompiledRule rule = createCompiledRule(policy);
+      compiledRules.add(rule);
+    }
+
+    SubjectContext.PolicyContext mockPolicyContext = mock(SubjectContext.PolicyContext.class);
+    when(mockPolicyContext.getRules()).thenReturn(compiledRules);
+    Iterator<SubjectContext.PolicyContext> policyContextIterator =
+        Collections.singletonList(mockPolicyContext).iterator();
+    when(mockSubjectContext.getPolicies(anyList())).thenReturn(policyContextIterator);
+
+    OMQueryBuilder finalQuery = evaluator.evaluateConditions(mockSubjectContext);
+
+    QueryBuilder elasticQuery = ((ElasticQueryBuilder) finalQuery).build();
+    String generatedQuery = elasticQuery.toString();
+    DocumentContext jsonContext = JsonPath.parse(generatedQuery);
+
+    assertFalse(
+        generatedQuery.contains("Create"), "The query should not contain 'Create' operation");
+    assertFalse(
+        generatedQuery.contains("Delete"), "The query should not contain 'Delete' operation");
+    assertFalse(generatedQuery.contains("Edit"), "The query should not contain 'Edit' operation");
+
+    boolean containsOwnerCondition = generatedQuery.contains("owners.id");
+    boolean containsTagCondition = generatedQuery.contains("tags.tagFQN");
+    assertTrue(
+        containsOwnerCondition || containsTagCondition,
+        "The query should include 'isOwner' or 'matchAnyTag' conditions where applicable");
+  }
+
+  // Helper methods
+  private CompiledRule createCompiledRule(Map<String, Object> policyDef) {
+    CompiledRule rule = mock(CompiledRule.class);
+    when(rule.getName()).thenReturn((String) policyDef.get("name"));
+    when(rule.getDescription()).thenReturn((String) policyDef.get("description"));
+    when(rule.getEffect())
+        .thenReturn(CompiledRule.Effect.valueOf(((String) policyDef.get("effect")).toUpperCase()));
+    when(rule.getOperations())
+        .thenReturn(mapOperations((List<String>) policyDef.get("operations")));
+    when(rule.getResources()).thenReturn((List<String>) policyDef.get("resources"));
+    when(rule.getCondition()).thenReturn((String) policyDef.getOrDefault("condition", ""));
+    return rule;
+  }
+
+  private List<MetadataOperation> mapOperations(List<String> operations) {
+    List<MetadataOperation> mappedOperations = new ArrayList<>();
+    for (String op : operations) {
+      if (op.equalsIgnoreCase("Create")
+          || op.equalsIgnoreCase("Delete")
+          || op.toLowerCase().startsWith("edit")) {
+        mappedOperations.add(MetadataOperation.VIEW_BASIC);
+      } else if (op.equalsIgnoreCase("All")) {
+        mappedOperations.add(MetadataOperation.ALL);
+      } else {
+        mappedOperations.add(MetadataOperation.fromValue(op));
+      }
+    }
+    return mappedOperations;
+  }
+
+  private List<Map<String, Object>> getPolicies() {
+    List<Map<String, Object>> policyDefs = new ArrayList<>();
+
+    Map<String, Object> policy1 = new HashMap<>();
+    policy1.put("name", "APP_ALLOW");
+    policy1.put("description", "APP MARKET PLACE DEFINITION ALLOW AS OWNER");
+    policy1.put("effect", "allow");
+    policy1.put("operations", List.of("ViewAll"));
+    policy1.put("resources", List.of("appMarketPlaceDefinition"));
+    policy1.put("condition", "matchAnyTag('tags.a') && isOwner()");
+    policyDefs.add(policy1);
+
+    Map<String, Object> policy2 = new HashMap<>();
+    policy2.put("name", "APP_ALLOW_2");
+    policy2.put("description", "APP MARKET PLACE DEFINITION ALLOW");
+    policy2.put("effect", "allow");
+    policy2.put("operations", List.of("ViewBasic"));
+    policy2.put("resources", List.of("appMarketPlaceDefinition"));
+    policyDefs.add(policy2);
+
+    Map<String, Object> policy3 = new HashMap<>();
+    policy3.put("name", "APP_DENY");
+    policy3.put("description", "APP MARKET PLACE DEFINITION DENY");
+    policy3.put("effect", "deny");
+    policy3.put("operations", List.of("Create", "Delete", "EditAll"));
+    policy3.put("resources", List.of("appMarketPlaceDefinition"));
+    policyDefs.add(policy3);
+
+    Map<String, Object> policy4 = new HashMap<>();
+    policy4.put("name", "APP_ALLOW_2");
+    policy4.put("description", "APP ALLOW");
+    policy4.put("effect", "allow");
+    policy4.put("operations", List.of("ViewBasic"));
+    policy4.put("resources", List.of("app"));
+    policyDefs.add(policy4);
+
+    Map<String, Object> policy5 = new HashMap<>();
+    policy5.put("name", "APP_ALLOW_3");
+    policy5.put("description", "APP DENY");
+    policy5.put("effect", "deny");
+    policy5.put("operations", List.of("Create", "Delete", "EditAll"));
+    policy5.put("resources", List.of("app"));
+    policyDefs.add(policy5);
+
+    return policyDefs;
+  }
 }
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/data/dashboardDataModel.json b/openmetadata-spec/src/main/resources/json/schema/entity/data/dashboardDataModel.json
index a8092ac328e0..7ce119b3990e 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/data/dashboardDataModel.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/data/dashboardDataModel.json
@@ -28,6 +28,12 @@
         {
           "name": "TableauDataModel"
         },
+        {
+          "name": "TableauPublishedDatasource"
+        },
+        {
+          "name": "TableauEmbeddedDatasource"
+        },
         {
           "name": "SupersetDataModel"
         },
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withAdvanceSearch.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withAdvanceSearch.tsx
index 3098df133874..19b05f55ec23 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withAdvanceSearch.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withAdvanceSearch.tsx
@@ -14,8 +14,8 @@ import React, { FC } from 'react';
 import { AdvanceSearchProvider } from '../../components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component';
 
 export const withAdvanceSearch =
-  (Component: FC) =>
-  (props: JSX.IntrinsicAttributes & { children?: React.ReactNode }) => {
+  <P extends Record<string, unknown>>(Component: FC<P>) =>
+  (props: P) => {
     return (
       <AdvanceSearchProvider>
         <Component {...props} />
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx
index b578c2fd66b5..cea014035d0b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx
@@ -769,7 +769,6 @@ export const AuthProvider = ({
       updateAxiosInterceptors: initializeAxiosInterceptors,
     });
 
-    return cleanup;
   }, [handleSuccessfulLogin]);
 
   const isConfigLoading =
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.interface.ts
new file mode 100644
index 000000000000..68543369c9bb
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.interface.ts
@@ -0,0 +1,16 @@
+/*
+ *  Copyright 2024 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+export enum QueryBuilderOutputType {
+  ELASTICSEARCH = 'elasticsearch',
+  JSON_LOGIC = 'jsonlogic',
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.test.tsx
new file mode 100644
index 000000000000..44b0b3895c49
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.test.tsx
@@ -0,0 +1,75 @@
+/*
+ *  Copyright 2024 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+import { Registry } from '@rjsf/utils';
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { BasicConfig } from 'react-awesome-query-builder';
+import AntdConfig from 'react-awesome-query-builder/lib/config/antd';
+import QueryBuilderWidget from './QueryBuilderWidget';
+
+const mockOnFocus = jest.fn();
+const mockOnBlur = jest.fn();
+const mockOnChange = jest.fn();
+const baseConfig = AntdConfig as BasicConfig;
+
+jest.mock(
+  '../../../../../Explore/AdvanceSearchProvider/AdvanceSearchProvider.component',
+  () => ({
+    AdvanceSearchProvider: ({ children }: { children: React.ReactNode }) => (
+      <div data-testid="advance-search-provider-mock">{children}</div>
+    ),
+    useAdvanceSearch: jest.fn().mockImplementation(() => ({
+      toggleModal: jest.fn(),
+      sqlQuery: '',
+      onResetAllFilters: jest.fn(),
+      onChangeSearchIndex: jest.fn(),
+      config: {
+        ...baseConfig,
+        fields: {},
+      },
+    })),
+  })
+);
+
+jest.mock('react-router-dom', () => ({
+  useLocation: jest.fn(),
+}));
+
+const mockProps = {
+  onFocus: mockOnFocus,
+  onBlur: mockOnBlur,
+  onChange: mockOnChange,
+  registry: {} as Registry,
+  schema: {
+    description: 'this is query builder field',
+    title: 'rules',
+    format: 'queryBuilder',
+    entityType: 'table',
+  },
+  value: '',
+  id: 'root/queryBuilder',
+  label: 'Query Builder',
+  name: 'queryBuilder',
+  options: {
+    enumOptions: [],
+  },
+};
+
+describe('QueryBuilderWidget', () => {
+  it('should render the query builder', () => {
+    render(<QueryBuilderWidget {...mockProps} />);
+    const builder = screen.getByTestId('query-builder-form-field');
+
+    expect(builder).toBeInTheDocument();
+  });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.tsx
new file mode 100644
index 000000000000..0e1b04275e7e
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.tsx
@@ -0,0 +1,159 @@
+/*
+ *  Copyright 2024 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+import { InfoCircleOutlined } from '@ant-design/icons';
+import { WidgetProps } from '@rjsf/utils';
+import { Alert, Button, Col, Typography } from 'antd';
+import { t } from 'i18next';
+import { debounce, isEmpty, isUndefined } from 'lodash';
+import Qs from 'qs';
+import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
+import {
+  Builder,
+  Config,
+  ImmutableTree,
+  Query,
+  Utils as QbUtils,
+} from 'react-awesome-query-builder';
+import { getExplorePath } from '../../../../../../constants/constants';
+import { EntityType } from '../../../../../../enums/entity.enum';
+import { SearchIndex } from '../../../../../../enums/search.enum';
+import { searchQuery } from '../../../../../../rest/searchAPI';
+import searchClassBase from '../../../../../../utils/SearchClassBase';
+import { withAdvanceSearch } from '../../../../../AppRouter/withAdvanceSearch';
+import { useAdvanceSearch } from '../../../../../Explore/AdvanceSearchProvider/AdvanceSearchProvider.component';
+import './query-builder-widget.less';
+import { QueryBuilderOutputType } from './QueryBuilderWidget.interface';
+
+const QueryBuilderWidget: FC<WidgetProps> = ({
+  onChange,
+  schema,
+  value,
+  ...props
+}: WidgetProps) => {
+  const { config, treeInternal, onTreeUpdate, onChangeSearchIndex } =
+    useAdvanceSearch();
+  const [searchResults, setSearchResults] = useState<number>(0);
+  const entityType =
+    (props.formContext?.entityType ?? props?.entityType) || EntityType.ALL;
+  const searchIndexMapping = searchClassBase.getEntityTypeSearchIndexMapping();
+  const searchIndex = searchIndexMapping[entityType as string];
+  const outputType = props?.outputType ?? QueryBuilderOutputType.ELASTICSEARCH;
+
+  const fetchEntityCount = useCallback(
+    async (queryFilter: Record<string, unknown>) => {
+      try {
+        const res = await searchQuery({
+          query: '',
+          pageNumber: 0,
+          pageSize: 0,
+          queryFilter,
+          searchIndex: SearchIndex.ALL,
+          includeDeleted: false,
+          trackTotalHits: true,
+          fetchSource: false,
+        });
+        setSearchResults(res.hits.total.value ?? 0);
+      } catch (_) {
+        // silent fail
+      }
+    },
+    []
+  );
+
+  const debouncedFetchEntityCount = useMemo(
+    () => debounce(fetchEntityCount, 300),
+    [fetchEntityCount]
+  );
+
+  const queryURL = useMemo(() => {
+    const queryFilterString = !isEmpty(treeInternal)
+      ? Qs.stringify({ queryFilter: JSON.stringify(treeInternal) })
+      : '';
+
+    return `${getExplorePath({})}${queryFilterString}`;
+  }, [treeInternal]);
+
+  const handleChange = (nTree: ImmutableTree, nConfig: Config) => {
+    onTreeUpdate(nTree, nConfig);
+
+    if (outputType === QueryBuilderOutputType.ELASTICSEARCH) {
+      const data = QbUtils.elasticSearchFormat(nTree, config) ?? {};
+      const qFilter = {
+        query: data,
+      };
+      if (data) {
+        debouncedFetchEntityCount(qFilter);
+      }
+
+      onChange(JSON.stringify(qFilter));
+    } else {
+      const data = QbUtils.jsonLogicFormat(nTree, config);
+      onChange(JSON.stringify(data.logic ?? '{}'));
+    }
+  };
+
+  useEffect(() => {
+    onChangeSearchIndex(searchIndex);
+  }, [searchIndex]);
+
+  return (
+    <div
+      className="query-builder-form-field"
+      data-testid="query-builder-form-field">
+      <Query
+        {...config}
+        renderBuilder={(props) => (
+          <div className="query-builder-container query-builder qb-lite">
+            <Builder {...props} />
+          </div>
+        )}
+        value={treeInternal}
+        onChange={handleChange}
+      />
+      {outputType === QueryBuilderOutputType.ELASTICSEARCH &&
+        !isUndefined(value) && (
+          <Col span={24}>
+            <Button
+              className="w-full p-0 text-left"
+              data-testid="view-assets-banner-button"
+              disabled={false}
+              href={queryURL}
+              target="_blank"
+              type="link">
+              <Alert
+                closable
+                showIcon
+                icon={<InfoCircleOutlined height={16} />}
+                message={
+                  <>
+                    <Typography.Text>
+                      {t('message.search-entity-count', {
+                        count: searchResults,
+                      })}
+                    </Typography.Text>
+
+                    <Typography.Text className="m-l-sm text-xs text-grey-muted">
+                      {t('message.click-here-to-view-assets-on-explore')}
+                    </Typography.Text>
+                  </>
+                }
+                type="info"
+              />
+            </Button>
+          </Col>
+        )}
+    </div>
+  );
+};
+
+export default withAdvanceSearch(QueryBuilderWidget);
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/query-builder-widget.less b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/query-builder-widget.less
new file mode 100644
index 000000000000..43d768729e2a
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/query-builder-widget.less
@@ -0,0 +1,42 @@
+/*
+ *  Copyright 2024 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+.query-builder-form-field {
+  .hide--line.one--child {
+    margin-top: 0;
+    padding-top: 16px;
+  }
+
+  .group.rule_group {
+    border: none !important;
+    padding: 0;
+
+    .group--children {
+      padding-top: 0;
+      padding-bottom: 0;
+      margin: 0;
+    }
+  }
+
+  .group--field {
+    width: 180px;
+
+    .ant-select {
+      width: 100% !important;
+    }
+
+    label {
+      font-weight: normal;
+      margin-bottom: 6px;
+    }
+  }
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilder/FormBuilder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilder/FormBuilder.tsx
index 23f624f7fa26..8f4cb2b608f6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilder/FormBuilder.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilder/FormBuilder.tsx
@@ -27,6 +27,7 @@ import { FieldErrorTemplate } from '../Form/JSONSchema/JSONSchemaTemplate/FieldE
 import { ObjectFieldTemplate } from '../Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate';
 import AsyncSelectWidget from '../Form/JSONSchema/JsonSchemaWidgets/AsyncSelectWidget';
 import PasswordWidget from '../Form/JSONSchema/JsonSchemaWidgets/PasswordWidget';
+import QueryBuilderWidget from '../Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget';
 import SelectWidget from '../Form/JSONSchema/JsonSchemaWidgets/SelectWidget';
 import Loader from '../Loader/Loader';
 
@@ -70,6 +71,7 @@ const FormBuilder: FunctionComponent<Props> = forwardRef(
     const widgets = {
       PasswordWidget: PasswordWidget,
       autoComplete: AsyncSelectWidget,
+      queryBuilder: QueryBuilderWidget,
       ...(useSelectWidget && { SelectWidget: SelectWidget }),
     };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
index 80ed7d544338..7ede75ac2c73 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
@@ -1393,6 +1393,7 @@
     "can-not-add-widget": "Can not add the widget to this section due to size restrictions.",
     "can-you-add-a-description": "Können Sie eine Beschreibung hinzufügen?",
     "checkout-service-connectors-doc": "Es gibt viele Konnektoren hier, um Daten von Ihren Diensten zu indizieren. Bitte schauen Sie sich unsere Konnektoren an.",
+    "click-here-to-view-assets-on-explore": "(Click to view the filtered assets on Explore page.)",
     "click-text-to-view-details": "Klicken Sie auf <0>{{text}}</0>, um Details anzuzeigen.",
     "closed-this-task": "hat diese Aufgabe geschlossen",
     "collaborate-with-other-user": "um mit anderen Benutzern zusammenzuarbeiten.",
@@ -1782,6 +1783,7 @@
     "schedule-for-ingestion-description": "Die Planung kann im stündlichen, täglichen oder wöchentlichen Rhythmus eingerichtet werden. Die Zeitzone ist UTC.",
     "scheduled-run-every": "Geplant, alle auszuführen",
     "scopes-comma-separated": "Fügen Sie den Wert der Bereiche hinzu, getrennt durch Kommata",
+    "search-entity-count": "{{count}} assets have been found with this filter.",
     "search-for-edge": "Suche nach Pipeline, StoredProcedures",
     "search-for-entity-types": "Suche nach Tabellen, Themen, Dashboards, Pipelines, ML-Modellen, Glossar und Tags.",
     "search-for-ingestion": "Suche nach Ingestion",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
index 199086f4be32..7cf7279dd766 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
@@ -1393,6 +1393,7 @@
     "can-not-add-widget": "Can not add the widget to this section due to size restrictions.",
     "can-you-add-a-description": "Can you add a description?",
     "checkout-service-connectors-doc": "There are a lot of connectors available here to index data from your services. Please checkout our connectors.",
+    "click-here-to-view-assets-on-explore": "(Click to view the filtered assets on Explore page.)",
     "click-text-to-view-details": "Click <0>{{text}}</0> to view details.",
     "closed-this-task": "closed this task",
     "collaborate-with-other-user": "to collaborate with other users.",
@@ -1782,6 +1783,7 @@
     "schedule-for-ingestion-description": "Scheduling can be set up at an hourly, daily, or weekly cadence. The timezone is in UTC.",
     "scheduled-run-every": "Scheduled to run every",
     "scopes-comma-separated": "Add the Scopes value, separated by commas",
+    "search-entity-count": "{{count}} assets have been found with this filter.",
     "search-for-edge": "Search for Pipeline, StoredProcedures",
     "search-for-entity-types": "Search for Tables, Topics, Dashboards, Pipelines, ML Models, Glossary and Tags.",
     "search-for-ingestion": "Search for ingestion",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
index c8b01b31475e..a7b6c3eb2ea1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
@@ -1393,6 +1393,7 @@
     "can-not-add-widget": "No se puede agregar el widget a esta sección debido a restricciones de tamaño.",
     "can-you-add-a-description": "¿Puedes agregar una descripción?",
     "checkout-service-connectors-doc": "Hay muchos conectores disponibles para ingesta de datos de tus servicios. Por favor, revisa nuestra documentación sobre conectores.",
+    "click-here-to-view-assets-on-explore": "(Click to view the filtered assets on Explore page.)",
     "click-text-to-view-details": "Haz clic en <0>{{text}}</0> para ver detalles.",
     "closed-this-task": "cerró esta tarea",
     "collaborate-with-other-user": "para colaborar con otros usuarios.",
@@ -1782,6 +1783,7 @@
     "schedule-for-ingestion-description": "La programación se puede configurar en una cadencia horaria, diaria o semanal.",
     "scheduled-run-every": "Programado para ejecutarse cada",
     "scopes-comma-separated": "Agrega el valor de ámbitos, separados por comas",
+    "search-entity-count": "{{count}} assets have been found with this filter.",
     "search-for-edge": "Buscar Pipeline, StoredProcedures",
     "search-for-entity-types": "Buscar Tablas, Temas, Paneles, Pipelines, Modelos de ML, Glosarios y Etiquetas.",
     "search-for-ingestion": "Buscar orígenes de datos",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
index 700cc2a946ce..f7c323534b53 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
@@ -1393,6 +1393,7 @@
     "can-not-add-widget": "Le widget ne peut être ajouté à cette section à cause des restrictions de taille.$",
     "can-you-add-a-description": "Pouvez-vous ajouter une description?",
     "checkout-service-connectors-doc": "Il y a de nombreux connecteurs disponibles ici pour indexer les données de vos services. Veuillez consulter nos connecteurs.",
+    "click-here-to-view-assets-on-explore": "(Click to view the filtered assets on Explore page.)",
     "click-text-to-view-details": "Cliquez sur <0>{{text}}</0> pour voir les détails.",
     "closed-this-task": "fermer cette tâche",
     "collaborate-with-other-user": "pour collaborer avec d'autres utilisateurs.",
@@ -1782,6 +1783,7 @@
     "schedule-for-ingestion-description": "La programmation peut être configurée à une cadence horaire, quotidienne ou hebdomadaire. Le fuseau horaire est en UTC.",
     "scheduled-run-every": "Programmer pour être exécuté tous les",
     "scopes-comma-separated": "Liste de scopes séparée par une virgule.",
+    "search-entity-count": "{{count}} assets have been found with this filter.",
     "search-for-edge": "Rechercher Pipeline, Procédures Stockées",
     "search-for-entity-types": "Rechercher Tables, Topics, Tableaux de Bord, Pipelines et Modèles d'IA",
     "search-for-ingestion": "Rechercher une ingestion",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
index 6e799c49c284..7e6b4580c659 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
@@ -1393,6 +1393,7 @@
     "can-not-add-widget": "לא ניתן להוסיף את הווידג'ט לסקשן זה עקב הגבלות בגודל.",
     "can-you-add-a-description": "האם תוכל להוסיף תיאור?",
     "checkout-service-connectors-doc": "ישנם חיבורים רבים כאן זמינים לאינדקסציה של נתונים מהשירותים שלך. בדוק את החיבורים שלנו.",
+    "click-here-to-view-assets-on-explore": "(Click to view the filtered assets on Explore page.)",
     "click-text-to-view-details": "לחץ על <0>{{text}}</0> לצפייה בפרטים.",
     "closed-this-task": "סגר משימה זו",
     "collaborate-with-other-user": "לשתף פעולה עם משתמשים אחרים.",
@@ -1782,6 +1783,7 @@
     "schedule-for-ingestion-description": "ניתן להגדיר שימוש כל שעה, יומית או שבועית. אזור הזמן הוא UTC.",
     "scheduled-run-every": "מתוזמן לרוץ כל",
     "scopes-comma-separated": "הוסף את ערכי הניקוד, מופרדים בפסיקים",
+    "search-entity-count": "{{count}} assets have been found with this filter.",
     "search-for-edge": "חיפוש לפי תהליך טעינה, פונקציות מאוחסנות",
     "search-for-entity-types": "חיפוש לפי טבלאות, נושאים, דשבורדים, תהליכי טעינה, מודלי למידת מכונה, מילוני מונחים ותגיות",
     "search-for-ingestion": "חיפוש תהליך טעינה (Ingestion)",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
index ae9b24c9baf9..b810ae443db0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
@@ -1393,6 +1393,7 @@
     "can-not-add-widget": "Can not add the widget to this section due to size restrictions.",
     "can-you-add-a-description": "説明を追加できますか?",
     "checkout-service-connectors-doc": "There are a lot of connectors available here to index data from your services. Please checkout our connectors.",
+    "click-here-to-view-assets-on-explore": "(Click to view the filtered assets on Explore page.)",
     "click-text-to-view-details": "Click <0>{{text}}</0> to view details.",
     "closed-this-task": "このタスクを閉じました",
     "collaborate-with-other-user": "to collaborate with other users.",
@@ -1782,6 +1783,7 @@
     "schedule-for-ingestion-description": "Scheduling can be set up at an hourly, daily, or weekly cadence. The timezone is in UTC.",
     "scheduled-run-every": "Scheduled to run every",
     "scopes-comma-separated": "スコープの値をカンマで区切って追加",
+    "search-entity-count": "{{count}} assets have been found with this filter.",
     "search-for-edge": "Search for Pipeline, StoredProcedures",
     "search-for-entity-types": "テーブル、トピック、ダッシュボード、パイプライン、MLモデルの検索。",
     "search-for-ingestion": "Search for ingestion",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
index 1b34e364d97c..9a8df974dc79 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
@@ -1393,6 +1393,7 @@
     "can-not-add-widget": "Kan de widget niet toevoegen aan deze sectie vanwege beperkingen in grootte.",
     "can-you-add-a-description": "Kunt u een beschrijving toevoegen?",
     "checkout-service-connectors-doc": "Er zijn hier veel connectors beschikbaar om data van uw services te indexeren. Bekijk onze connectors.",
+    "click-here-to-view-assets-on-explore": "(Click to view the filtered assets on Explore page.)",
     "click-text-to-view-details": "Klik op <0>{{text}}</0> om details te bekijken.",
     "closed-this-task": "heeft deze taak gesloten",
     "collaborate-with-other-user": "om samen te werken met andere gebruikers.",
@@ -1782,6 +1783,7 @@
     "schedule-for-ingestion-description": "Planning kan worden ingesteld op een uurlijkse, dagelijkse of wekelijkse cadans. De tijdzone is in UTC.",
     "scheduled-run-every": "Gepland om elke keer uit te voeren",
     "scopes-comma-separated": "Voeg de herkomstwaarde toe, gescheiden door komma's",
+    "search-entity-count": "{{count}} assets have been found with this filter.",
     "search-for-edge": "Zoeken naar Pipeline, Stored Procedures",
     "search-for-entity-types": "Zoeken naar Tabellen, Onderwerpen, Dashboards, Pipelines, ML-modellen, Woordenlijst en Tags.",
     "search-for-ingestion": "Zoeken naar ingestie",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
index 83666f2f87d3..219d7edd97d7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
@@ -1393,6 +1393,7 @@
     "can-not-add-widget": "به دلیل محدودیت‌های اندازه، نمی‌توان ویجت را به این بخش اضافه کرد.",
     "can-you-add-a-description": "آیا می‌توانید توضیحی اضافه کنید؟",
     "checkout-service-connectors-doc": "اینجا تعدادی از اتصالات برای ایندکس کردن داده‌ها از خدمات خود موجود است. لطفاً مستندات ما را بررسی کنید.",
+    "click-here-to-view-assets-on-explore": "(Click to view the filtered assets on Explore page.)",
     "click-text-to-view-details": "برای مشاهده جزئیات، روی <0>{{text}}</0> کلیک کنید.",
     "closed-this-task": "این وظیفه را بست.",
     "collaborate-with-other-user": "برای همکاری با کاربران دیگر.",
@@ -1782,6 +1783,7 @@
     "schedule-for-ingestion-description": "برنامه‌ریزی می‌تواند به صورت ساعتی، روزانه یا هفتگی تنظیم شود. منطقه زمانی UTC است.",
     "scheduled-run-every": "برنامه‌ریزی شده برای اجرا هر",
     "scopes-comma-separated": "مقدار Scopes را با کاما جدا کنید.",
+    "search-entity-count": "{{count}} assets have been found with this filter.",
     "search-for-edge": "جستجوی خطوط لوله، StoredProcedures.",
     "search-for-entity-types": "جستجوی جداول، موضوعات، داشبوردها، خطوط لوله، مدل‌های ML، واژه‌نامه و برچسب‌ها.",
     "search-for-ingestion": "جستجوی ورود داده.",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
index eb1baa9f4613..d10839ef589b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
@@ -1393,6 +1393,7 @@
     "can-not-add-widget": "Não é possível adicionar o widget a esta seção devido a restrições de tamanho.",
     "can-you-add-a-description": "Você pode adicionar uma descrição?",
     "checkout-service-connectors-doc": "Há muitos conectores disponíveis aqui para indexar dados de seus serviços. Por favor, confira nossos conectores.",
+    "click-here-to-view-assets-on-explore": "(Click to view the filtered assets on Explore page.)",
     "click-text-to-view-details": "Clique em <0>{{text}}</0> para ver detalhes.",
     "closed-this-task": "fechou esta tarefa",
     "collaborate-with-other-user": "para colaborar com outros usuários.",
@@ -1782,6 +1783,7 @@
     "schedule-for-ingestion-description": "O agendamento pode ser configurado em uma frequência horária, diária ou semanal. O fuso horário é em UTC.",
     "scheduled-run-every": "Agendado para rodar a cada",
     "scopes-comma-separated": "Adicione o valor dos Escopos, separados por vírgulas",
+    "search-entity-count": "{{count}} assets have been found with this filter.",
     "search-for-edge": "Pesquisar por Pipeline, StoredProcedures",
     "search-for-entity-types": "Pesquisar por Tabelas, Tópicos, Painéis, Pipelines, Modelos de ML, Glossário e Tags.",
     "search-for-ingestion": "Pesquisar por ingestão",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
index 28a568ab50c4..c057687dc212 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
@@ -1393,6 +1393,7 @@
     "can-not-add-widget": "Can not add the widget to this section due to size restrictions.",
     "can-you-add-a-description": "Можете добавить описание?",
     "checkout-service-connectors-doc": "Здесь доступно множество коннекторов для индексации данных из ваших сервисов. Пожалуйста, ознакомьтесь с нашими коннекторами.",
+    "click-here-to-view-assets-on-explore": "(Click to view the filtered assets on Explore page.)",
     "click-text-to-view-details": "Нажмите <0>{{text}}</0>, чтобы просмотреть подробности.",
     "closed-this-task": "задача закрыта",
     "collaborate-with-other-user": "для совместной работы с другими пользователями.",
@@ -1782,6 +1783,7 @@
     "schedule-for-ingestion-description": "Планирование может быть настроено на почасовой, ежедневной или еженедельной частоте. Часовой пояс указан в формате UTC.",
     "scheduled-run-every": "Запланирован запуск каждый",
     "scopes-comma-separated": "Добавьте значение областей, разделенное запятыми",
+    "search-entity-count": "{{count}} assets have been found with this filter.",
     "search-for-edge": "Search for Pipeline, StoredProcedures",
     "search-for-entity-types": "Поиск по таблицам, топикам, дашбордам, пайплайнам, моделям машинного обучения, глоссарию и тегам.",
     "search-for-ingestion": "Поиск для получения",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
index ef3a93128a21..b3d2e527c351 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
@@ -1393,6 +1393,7 @@
     "can-not-add-widget": "Can not add the widget to this section due to size restrictions.",
     "can-you-add-a-description": "您能添加一些描述吗？",
     "checkout-service-connectors-doc": "我们已经预置了很多连接器, 可用于索引您的各项服务数据",
+    "click-here-to-view-assets-on-explore": "(Click to view the filtered assets on Explore page.)",
     "click-text-to-view-details": "点击<0>{{text}}</0>查看详情",
     "closed-this-task": "关闭了此任务",
     "collaborate-with-other-user": "与其他用户协作",
@@ -1782,6 +1783,7 @@
     "schedule-for-ingestion-description": "可设置每小时、每天或每周的计划, 时区为 UTC",
     "scheduled-run-every": "计划每次运行",
     "scopes-comma-separated": "范围值逗号分隔",
+    "search-entity-count": "{{count}} assets have been found with this filter.",
     "search-for-edge": "搜索工作流、存储过程",
     "search-for-entity-types": "搜索数据表、消息主题、仪表板、工作流和机械学习模型",
     "search-for-ingestion": "搜索提取作业",