diff --git a/metadata-ingestion/tests/integration/hive/docker-compose.yml b/metadata-ingestion/tests/integration/hive/docker-compose.yml
index 6821d6dc67..9f2f3a6a92 100644
--- a/metadata-ingestion/tests/integration/hive/docker-compose.yml
+++ b/metadata-ingestion/tests/integration/hive/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     env_file:
       - ./hadoop-hive.env
     ports:
-      - "50070:50070"
+      - "50070"
   datanode:
     image: bde2020/hadoop-datanode:2.0.0-hadoop2.7.4-java8
     volumes:
diff --git a/metadata-ingestion/tests/integration/presto-on-hive/docker-compose.yml b/metadata-ingestion/tests/integration/presto-on-hive/docker-compose.yml
index 16eab23aa2..bc52779d71 100644
--- a/metadata-ingestion/tests/integration/presto-on-hive/docker-compose.yml
+++ b/metadata-ingestion/tests/integration/presto-on-hive/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     env_file:
       - ./setup/hadoop-hive.env
     ports:
-      - "50070:50070"
+      - "50070"
   datanode:
     image: bde2020/hadoop-datanode:2.0.0-hadoop2.7.4-java8
     volumes:
diff --git a/metadata-ingestion/tests/integration/trino/docker-compose.yml b/metadata-ingestion/tests/integration/trino/docker-compose.yml
index 7c521d777f..59ba91e46d 100644
--- a/metadata-ingestion/tests/integration/trino/docker-compose.yml
+++ b/metadata-ingestion/tests/integration/trino/docker-compose.yml
@@ -3,7 +3,7 @@
 version: "3"
 
 services:
- 
+
   testtrino:
     image: trinodb/trino:369
     container_name: "testtrino"
@@ -14,13 +14,13 @@ services:
     depends_on:
       - "trinodb_postgres"
       - "hive-metastore"
-  
+
   trinodb_postgres:
     image: postgres:alpine
     container_name: "trinodb_postgres"
     environment:
       POSTGRES_PASSWORD: datahub
-    volumes:  
+    volumes:
       - ./setup/setup.sql:/docker-entrypoint-initdb.d/postgres_setup.sql
     ports:
       - "5432:5432"
@@ -33,7 +33,7 @@ services:
     env_file:
       - ./setup/hadoop-hive.env
     ports:
-      - "50070:50070"
+      - "50070"
   datanode:
     image: bde2020/hadoop-datanode:2.0.0-hadoop2.7.4-java8
     volumes:
@@ -43,7 +43,7 @@ services:
     environment:
       SERVICE_PRECONDITION: "namenode:50070"
     ports:
-      - "50075:50075"
+      - "50075"
   hive-server:
     image: bde2020/hive:2.3.2-postgresql-metastore
     container_name: "testhiveserver2"
@@ -58,7 +58,6 @@ services:
       - ./setup/hive_setup.sql:/hive_setup.sql
   hive-metastore:
     image: bde2020/hive:2.3.2-postgresql-metastore
-    container_name: "hive-metastore"
     env_file:
       - ./setup/hadoop-hive.env
     command: /opt/hive/bin/hive --service metastore
diff --git a/metadata-ingestion/tests/test_helpers/docker_helpers.py b/metadata-ingestion/tests/test_helpers/docker_helpers.py
index 0cbae4b2db..62654cf9f6 100644
--- a/metadata-ingestion/tests/test_helpers/docker_helpers.py
+++ b/metadata-ingestion/tests/test_helpers/docker_helpers.py
@@ -48,14 +48,14 @@ def docker_compose_runner(
 ):
     @contextlib.contextmanager
     def run(
-        compose_file_path: Union[str, list], key: str
+        compose_file_path: Union[str, list], key: str, cleanup: bool = True
     ) -> pytest_docker.plugin.Services:
         with pytest_docker.plugin.get_docker_services(
             docker_compose_command=docker_compose_command,
             docker_compose_file=compose_file_path,
             docker_compose_project_name=f"{docker_compose_project_name}-{key}",
             docker_setup=docker_setup,
-            docker_cleanup=docker_cleanup,
+            docker_cleanup=docker_cleanup if cleanup else False,
         ) as docker_services:
             yield docker_services