diff --git a/docker/docker-compose-with-cassandra.yml b/docker/docker-compose-with-cassandra.yml
index 39f4341600572..48239fcd87831 100644
--- a/docker/docker-compose-with-cassandra.yml
+++ b/docker/docker-compose-with-cassandra.yml
@@ -43,7 +43,7 @@ services:
         dockerfile: docker/datahub-gms/Dockerfile
     env_file: ./datahub-gms/env/docker.cassandra.env
     healthcheck:
-      test: curl -sS --fail http://datahub-gms:${DATAHUB_MAPPED_GMS_PORT:-8080}/health
+      test: curl -sS --fail http://datahub-gms:${DATAHUB_GMS_PORT:-8080}/health
       start_period: 20s
       interval: 1s
       retries: 20
diff --git a/docker/docker-compose-without-neo4j.yml b/docker/docker-compose-without-neo4j.yml
index 235e89e340551..6191994eaa1ea 100644
--- a/docker/docker-compose-without-neo4j.yml
+++ b/docker/docker-compose-without-neo4j.yml
@@ -44,7 +44,7 @@ services:
         dockerfile: docker/datahub-gms/Dockerfile
     env_file: datahub-gms/env/docker-without-neo4j.env
     healthcheck:
-      test: curl -sS --fail http://datahub-gms:${DATAHUB_MAPPED_GMS_PORT:-8080}/health
+      test: curl -sS --fail http://datahub-gms:${DATAHUB_GMS_PORT:-8080}/health
       start_period: 90s
       interval: 1s
       retries: 3
@@ -119,7 +119,7 @@ services:
         limits:
           memory: 1G
     healthcheck:
-      test: curl -sS --fail http://elasticsearch:$${DATAHUB_MAPPED_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
+      test: curl -sS --fail http://elasticsearch:$${DATAHUB_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
       start_period: 20s
       interval: 1s
       retries: 3
@@ -134,7 +134,7 @@ services:
     - ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}:8081
     env_file: schema-registry/env/docker.env
     healthcheck:
-      test: nc -z schema-registry ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}
+      test: nc -z schema-registry ${DATAHUB_SCHEMA_REGISTRY_PORT:-8081}
       start_period: 60s
       interval: 1s
       retries: 3
@@ -150,7 +150,7 @@ services:
     - ${DATAHUB_MAPPED_KAFKA_BROKER_PORT:-9092}:9092
     env_file: broker/env/docker.env
     healthcheck:
-      test: nc -z broker $${DATAHUB_MAPPED_KAFKA_BROKER_PORT:-9092}
+      test: nc -z broker $${DATAHUB_KAFKA_BROKER_PORT:-9092}
       start_period: 60s
       interval: 1s
       retries: 5
@@ -168,7 +168,7 @@ services:
     - ${DATAHUB_MAPPED_ZK_PORT:-2181}:2181
     env_file: zookeeper/env/docker.env
     healthcheck:
-      test: echo srvr | nc zookeeper $${DATAHUB_MAPPED_ZK_PORT:-2181}
+      test: echo srvr | nc zookeeper $${DATAHUB_ZK_PORT:-2181}
       start_period: 30s
       interval: 5s
       retries: 3
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 46da8c6fdbd2a..95f56fe47e3cc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -42,7 +42,7 @@ services:
         context: ../
         dockerfile: docker/datahub-gms/Dockerfile
     healthcheck:
-      test: curl -sS --fail http://datahub-gms:${DATAHUB_MAPPED_GMS_PORT:-8080}/health
+      test: curl -sS --fail http://datahub-gms:${DATAHUB_GMS_PORT:-8080}/health
       start_period: 90s
       interval: 1s
       retries: 3
@@ -124,7 +124,7 @@ services:
         limits:
           memory: 1G
     healthcheck:
-      test: curl -sS --fail http://elasticsearch:$${DATAHUB_MAPPED_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
+      test: curl -sS --fail http://elasticsearch:$${DATAHUB_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
       start_period: 20s
       interval: 1s
       retries: 3
@@ -140,7 +140,7 @@ services:
     - ${DATAHUB_MAPPED_NEO4J_BOLT_PORT:-7687}:7687
     env_file: neo4j/env/docker.env
     healthcheck:
-      test: wget http://neo4j:$${DATAHUB_MAPPED_NEO4J_HTTP_PORT:-7474}
+      test: wget http://neo4j:$${DATAHUB_NEO4J_HTTP_PORT:-7474}
       start_period: 5s
       interval: 1s
       retries: 5
@@ -155,7 +155,7 @@ services:
     - ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}:8081
     env_file: schema-registry/env/docker.env
     healthcheck:
-      test: nc -z schema-registry ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}
+      test: nc -z schema-registry ${DATAHUB_SCHEMA_REGISTRY_PORT:-8081}
       start_period: 60s
       interval: 1s
       retries: 3
@@ -171,7 +171,7 @@ services:
     - ${DATAHUB_MAPPED_KAFKA_BROKER_PORT:-9092}:9092
     env_file: broker/env/docker.env
     healthcheck:
-      test: nc -z broker $${DATAHUB_MAPPED_KAFKA_BROKER_PORT:-9092}
+      test: nc -z broker $${DATAHUB_KAFKA_BROKER_PORT:-9092}
       start_period: 60s
       interval: 1s
       retries: 5
@@ -189,7 +189,7 @@ services:
     - ${DATAHUB_MAPPED_ZK_PORT:-2181}:2181
     env_file: zookeeper/env/docker.env
     healthcheck:
-      test: echo srvr | nc zookeeper $${DATAHUB_MAPPED_ZK_PORT:-2181}
+      test: echo srvr | nc zookeeper $${DATAHUB_ZK_PORT:-2181}
       start_period: 10s
       interval: 5s
       retries: 3
diff --git a/docker/quickstart/docker-compose-m1.quickstart.yml b/docker/quickstart/docker-compose-m1.quickstart.yml
index 4df32395cf82d..7b7ca4052f324 100644
--- a/docker/quickstart/docker-compose-m1.quickstart.yml
+++ b/docker/quickstart/docker-compose-m1.quickstart.yml
@@ -22,7 +22,7 @@ services:
       interval: 1s
       retries: 5
       start_period: 60s
-      test: nc -z broker $${DATAHUB_MAPPED_KAFKA_BROKER_PORT:-9092}
+      test: nc -z broker $${DATAHUB_KAFKA_BROKER_PORT:-9092}
       timeout: 5s
     hostname: broker
     image: confluentinc/cp-kafka:7.4.0
@@ -111,7 +111,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 90s
-      test: curl -sS --fail http://datahub-gms:${DATAHUB_MAPPED_GMS_PORT:-8080}/health
+      test: curl -sS --fail http://datahub-gms:${DATAHUB_GMS_PORT:-8080}/health
       timeout: 5s
     hostname: datahub-gms
     image: ${DATAHUB_GMS_IMAGE:-linkedin/datahub-gms}:${DATAHUB_VERSION:-head}
@@ -171,7 +171,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 20s
-      test: curl -sS --fail http://elasticsearch:$${DATAHUB_MAPPED_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
+      test: curl -sS --fail http://elasticsearch:$${DATAHUB_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
       timeout: 5s
     hostname: elasticsearch
     image: ${DATAHUB_SEARCH_IMAGE:-elasticsearch}:${DATAHUB_SEARCH_TAG:-7.10.1}
@@ -258,7 +258,7 @@ services:
       interval: 1s
       retries: 5
       start_period: 5s
-      test: wget http://neo4j:$${DATAHUB_MAPPED_NEO4J_HTTP_PORT:-7474}
+      test: wget http://neo4j:$${DATAHUB_NEO4J_HTTP_PORT:-7474}
       timeout: 5s
     hostname: neo4j
     image: neo4j/neo4j-arm64-experimental:4.0.6-arm64
@@ -280,7 +280,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 60s
-      test: nc -z schema-registry ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}
+      test: nc -z schema-registry ${DATAHUB_SCHEMA_REGISTRY_PORT:-8081}
       timeout: 5s
     hostname: schema-registry
     image: confluentinc/cp-schema-registry:7.4.0
@@ -295,7 +295,7 @@ services:
       interval: 5s
       retries: 3
       start_period: 10s
-      test: echo srvr | nc zookeeper $${DATAHUB_MAPPED_ZK_PORT:-2181}
+      test: echo srvr | nc zookeeper $${DATAHUB_ZK_PORT:-2181}
       timeout: 5s
     hostname: zookeeper
     image: confluentinc/cp-zookeeper:7.4.0
diff --git a/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
index b1cb6c208a42d..53dacaf6ef63b 100644
--- a/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
+++ b/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
@@ -22,7 +22,7 @@ services:
       interval: 1s
       retries: 5
       start_period: 60s
-      test: nc -z broker $${DATAHUB_MAPPED_KAFKA_BROKER_PORT:-9092}
+      test: nc -z broker $${DATAHUB_KAFKA_BROKER_PORT:-9092}
       timeout: 5s
     hostname: broker
     image: confluentinc/cp-kafka:7.4.0
@@ -106,7 +106,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 90s
-      test: curl -sS --fail http://datahub-gms:${DATAHUB_MAPPED_GMS_PORT:-8080}/health
+      test: curl -sS --fail http://datahub-gms:${DATAHUB_GMS_PORT:-8080}/health
       timeout: 5s
     hostname: datahub-gms
     image: ${DATAHUB_GMS_IMAGE:-linkedin/datahub-gms}:${DATAHUB_VERSION:-head}
@@ -164,7 +164,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 20s
-      test: curl -sS --fail http://elasticsearch:$${DATAHUB_MAPPED_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
+      test: curl -sS --fail http://elasticsearch:$${DATAHUB_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
       timeout: 5s
     hostname: elasticsearch
     image: ${DATAHUB_SEARCH_IMAGE:-elasticsearch}:${DATAHUB_SEARCH_TAG:-7.10.1}
@@ -253,7 +253,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 60s
-      test: nc -z schema-registry ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}
+      test: nc -z schema-registry ${DATAHUB_SCHEMA_REGISTRY_PORT:-8081}
       timeout: 5s
     hostname: schema-registry
     image: confluentinc/cp-schema-registry:7.4.0
@@ -268,7 +268,7 @@ services:
       interval: 5s
       retries: 3
       start_period: 30s
-      test: echo srvr | nc zookeeper $${DATAHUB_MAPPED_ZK_PORT:-2181}
+      test: echo srvr | nc zookeeper $${DATAHUB_ZK_PORT:-2181}
       timeout: 5s
     hostname: zookeeper
     image: confluentinc/cp-zookeeper:7.4.0
diff --git a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
index 6eac53229e82a..1ca91aa19206d 100644
--- a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
+++ b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
@@ -22,7 +22,7 @@ services:
       interval: 1s
       retries: 5
       start_period: 60s
-      test: nc -z broker $${DATAHUB_MAPPED_KAFKA_BROKER_PORT:-9092}
+      test: nc -z broker $${DATAHUB_KAFKA_BROKER_PORT:-9092}
       timeout: 5s
     hostname: broker
     image: confluentinc/cp-kafka:7.4.0
@@ -106,7 +106,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 90s
-      test: curl -sS --fail http://datahub-gms:${DATAHUB_MAPPED_GMS_PORT:-8080}/health
+      test: curl -sS --fail http://datahub-gms:${DATAHUB_GMS_PORT:-8080}/health
       timeout: 5s
     hostname: datahub-gms
     image: ${DATAHUB_GMS_IMAGE:-linkedin/datahub-gms}:${DATAHUB_VERSION:-head}
@@ -164,7 +164,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 20s
-      test: curl -sS --fail http://elasticsearch:$${DATAHUB_MAPPED_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
+      test: curl -sS --fail http://elasticsearch:$${DATAHUB_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
       timeout: 5s
     hostname: elasticsearch
     image: ${DATAHUB_SEARCH_IMAGE:-elasticsearch}:${DATAHUB_SEARCH_TAG:-7.10.1}
@@ -253,7 +253,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 60s
-      test: nc -z schema-registry ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}
+      test: nc -z schema-registry ${DATAHUB_SCHEMA_REGISTRY_PORT:-8081}
       timeout: 5s
     hostname: schema-registry
     image: confluentinc/cp-schema-registry:7.4.0
@@ -268,7 +268,7 @@ services:
       interval: 5s
       retries: 3
       start_period: 30s
-      test: echo srvr | nc zookeeper $${DATAHUB_MAPPED_ZK_PORT:-2181}
+      test: echo srvr | nc zookeeper $${DATAHUB_ZK_PORT:-2181}
       timeout: 5s
     hostname: zookeeper
     image: confluentinc/cp-zookeeper:7.4.0
diff --git a/docker/quickstart/docker-compose.quickstart.yml b/docker/quickstart/docker-compose.quickstart.yml
index 86d70abd2b815..c77b4418b6f36 100644
--- a/docker/quickstart/docker-compose.quickstart.yml
+++ b/docker/quickstart/docker-compose.quickstart.yml
@@ -22,7 +22,7 @@ services:
       interval: 1s
       retries: 5
       start_period: 60s
-      test: nc -z broker $${DATAHUB_MAPPED_KAFKA_BROKER_PORT:-9092}
+      test: nc -z broker $${DATAHUB_KAFKA_BROKER_PORT:-9092}
       timeout: 5s
     hostname: broker
     image: confluentinc/cp-kafka:7.4.0
@@ -111,7 +111,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 90s
-      test: curl -sS --fail http://datahub-gms:${DATAHUB_MAPPED_GMS_PORT:-8080}/health
+      test: curl -sS --fail http://datahub-gms:${DATAHUB_GMS_PORT:-8080}/health
       timeout: 5s
     hostname: datahub-gms
     image: ${DATAHUB_GMS_IMAGE:-linkedin/datahub-gms}:${DATAHUB_VERSION:-head}
@@ -171,7 +171,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 20s
-      test: curl -sS --fail http://elasticsearch:$${DATAHUB_MAPPED_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
+      test: curl -sS --fail http://elasticsearch:$${DATAHUB_ELASTIC_PORT:-9200}/_cluster/health?wait_for_status=yellow&timeout=0s
       timeout: 5s
     hostname: elasticsearch
     image: ${DATAHUB_SEARCH_IMAGE:-elasticsearch}:${DATAHUB_SEARCH_TAG:-7.10.1}
@@ -258,7 +258,7 @@ services:
       interval: 1s
       retries: 5
       start_period: 5s
-      test: wget http://neo4j:$${DATAHUB_MAPPED_NEO4J_HTTP_PORT:-7474}
+      test: wget http://neo4j:$${DATAHUB_NEO4J_HTTP_PORT:-7474}
       timeout: 5s
     hostname: neo4j
     image: neo4j:4.4.9-community
@@ -280,7 +280,7 @@ services:
       interval: 1s
       retries: 3
       start_period: 60s
-      test: nc -z schema-registry ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}
+      test: nc -z schema-registry ${DATAHUB_SCHEMA_REGISTRY_PORT:-8081}
       timeout: 5s
     hostname: schema-registry
     image: confluentinc/cp-schema-registry:7.4.0
@@ -295,7 +295,7 @@ services:
       interval: 5s
       retries: 3
       start_period: 10s
-      test: echo srvr | nc zookeeper $${DATAHUB_MAPPED_ZK_PORT:-2181}
+      test: echo srvr | nc zookeeper $${DATAHUB_ZK_PORT:-2181}
       timeout: 5s
     hostname: zookeeper
     image: confluentinc/cp-zookeeper:7.4.0