diff --git a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2
index 83dd2f178a0b..c9244f31ec40 100644
--- a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2
+++ b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2
@@ -34,6 +34,9 @@ services:
     links:
       - postgres
       - redis_{{ container_postfix }}
+    networks:
+      - awx
+      - service-mesh
     working_dir: "/awx_devel"
     volumes:
       - "../../../:/awx_devel"
@@ -73,6 +76,8 @@ services:
     volumes:
       - "../../redis/redis.conf:/usr/local/etc/redis/redis.conf:Z"
       - "redis_socket_{{ container_postfix }}:/var/run/redis/:rw"
+    networks:
+      - awx
     entrypoint: ["redis-server"]
     command: ["/usr/local/etc/redis/redis.conf"]
 {% endfor %}
@@ -82,6 +87,8 @@ services:
     user: "{{ ansible_user_uid }}"
     volumes:
       - "./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:Z"
+    networks:
+      - awx
     ports:
       - "8013:8013"
       - "8043:8043"
@@ -98,6 +105,8 @@ services:
     container_name: tools_keycloak_1
     hostname: keycloak
     user: "{{ ansible_user_uid }}"
+    networks:
+      - awx
     ports:
       - "8443:8443"
     environment:
@@ -115,6 +124,8 @@ services:
     container_name: tools_ldap_1
     hostname: ldap
     user: "{{ ansible_user_uid }}"
+    networks:
+      - awx
     ports:
       - "389:1389"
       - "636:1636"
@@ -137,6 +148,8 @@ services:
     image: splunk/splunk:latest
     container_name: tools_splunk_1
     hostname: splunk
+    networks:
+      - awx
     ports:
       - "8000:8000"
       - "8089:8089"
@@ -150,6 +163,8 @@ services:
     image: prom/prometheus:latest
     container_name: tools_prometheus_1
     hostname: prometheus
+    networks:
+      - awx
     ports:
       - "9090:9090"
     volumes:
@@ -165,6 +180,8 @@ services:
     image: grafana/grafana-enterprise:latest
     container_name: tools_grafana_1
     hostname: grafana
+    networks:
+      - awx
     ports:
       - "3001:3000"
     volumes:
@@ -201,13 +218,17 @@ services:
       POSTGRES_PASSWORD: {{ pg_password }}
     volumes:
       - "awx_db:/var/lib/postgresql/data"
+    networks:
+      - awx
     ports:
-       - "${AWX_PG_PORT:-5432}:5432"
+       - "${AWX_PG_PORT:-5441}:5432"
 {% if enable_pgbouncer|bool %}
   pgbouncer:
     image: bitnami/pgbouncer:latest
     container_name: tools_pgbouncer_1
     hostname: pgbouncer
+    networks:
+      - awx
     environment:
       POSTGRESQL_USERNAME: {{ pg_username }}
       POSTGRESQL_DATABASE: {{ pg_database }}
@@ -231,6 +252,8 @@ services:
     command: 'receptor --config /etc/receptor/receptor.conf'
     links:
       - awx_1
+    networks:
+      - awx
     ports:
       - "5555:5555"
     volumes:
@@ -246,6 +269,8 @@ services:
       RECEPTORCTL_SOCKET: {{ receptor_socket_file }}
     links:
       - receptor-hop
+    networks:
+      - awx
     volumes:
       - "../../../:/awx_devel"  # not used, but mounted so that any in-place installs can be used for whole cluster
       - "../../docker-compose/_sources/receptor/receptor-worker-{{ loop.index }}.conf:/etc/receptor/receptor.conf"
@@ -260,6 +285,8 @@ services:
     container_name: tools_vault_1
     command: server
     hostname: vault
+    networks:
+      - awx
     ports:
       - "1234:1234"
     environment:
@@ -302,8 +329,11 @@ volumes:
   grafana_storage:
     name: tools_grafana_storage
 {% endif %}
-{% if minikube_container_group|bool %}
 networks:
+  awx:
+  service-mesh:
+    name: service-mesh
+{% if minikube_container_group|bool %}
   default:
     external:
       name: minikube