diff --git a/container-compose-dev.yml b/container-compose-dev.yml
index 43497bac..47526959 100644
--- a/container-compose-dev.yml
+++ b/container-compose-dev.yml
@@ -56,6 +56,14 @@ services:
         app_protocol: pop3s
         mode: host
         name: "port for pop3s connections to proxy"
+    depends_on:
+      - orbit
+      - smtp
+      - pop
+    networks:
+      - orbit
+      - smtp
+      - pop
   orbit:
     build:
       context: orbit
@@ -76,13 +84,8 @@ services:
         target: /orbit/docs
         read_only: true
         selinux: z
-    ports:
-      - target: 9098
-        published: 9098
-        protocol: tcp
-        app_protocol: http
-        mode: host
-        name: "unencrypted http upstream server port"
+    networks:
+      - orbit
   smtp:
     build:
       context: smtp
@@ -99,13 +102,8 @@ services:
         target: /mnt/email_data
         read_only: false
         selinux: z
-    ports:
-      - target: 1465
-        published: 11465
-        protocol: tcp
-        app_protocol: smtp
-        mode: host
-        name: "unencrypted smtp upstream server port"
+    networks:
+      - smtp
   pop:
     build:
       context: pop
@@ -121,10 +119,9 @@ services:
         target: /mnt/mail
         read_only: true
         selinux: z
-    ports:
-      - target: 1995
-        published: 11995
-        protocol: tcp
-        app_protocol: pop3
-        mode: host
-        name: "unencrypted pop3 upstream server port"
+    networks:
+      - pop
+networks:
+  orbit:
+  smtp:
+  pop:
diff --git a/container-compose-staging.yml b/container-compose-staging.yml
index 6b558a2a..94a6c72a 100644
--- a/container-compose-staging.yml
+++ b/container-compose-staging.yml
@@ -48,6 +48,14 @@ services:
         app_protocol: pop3s
         mode: host
         name: "port for pop3s connections to proxy"
+    depends_on:
+      - orbit
+      - smtp
+      - pop
+    networks:
+      - orbit
+      - smtp
+      - pop
   orbit:
     build:
       context: orbit
@@ -66,13 +74,8 @@ services:
         target: /orbit/docs
         read_only: true
         selinux: z
-    ports:
-      - target: 9098
-        published: 9098
-        protocol: tcp
-        app_protocol: http
-        mode: host
-        name: "unencrypted http upstream server port"
+    networks:
+      - orbit
   smtp:
     build:
       context: smtp
@@ -89,13 +92,8 @@ services:
         target: /mnt/email_data
         read_only: false
         selinux: z
-    ports:
-      - target: 1465
-        published: 11465
-        protocol: tcp
-        app_protocol: smtp
-        mode: host
-        name: "unencrypted smtp upstream server port"
+    networks:
+      - smtp
   pop:
     build:
       context: pop
@@ -111,10 +109,9 @@ services:
         target: /mnt/mail
         read_only: true
         selinux: z
-    ports:
-      - target: 1995
-        published: 11995
-        protocol: tcp
-        app_protocol: pop3
-        mode: host
-        name: "unencrypted pop3 upstream server port"
+    networks:
+      - pop
+networks:
+  orbit:
+  smtp:
+  pop:
diff --git a/container-compose.yml b/container-compose.yml
index 6c677e8d..a1405aa5 100644
--- a/container-compose.yml
+++ b/container-compose.yml
@@ -48,6 +48,14 @@ services:
         app_protocol: pop3s
         mode: host
         name: "port for pop3s connections to proxy"
+    depends_on:
+      - orbit
+      - smtp
+      - pop
+    networks:
+      - orbit
+      - smtp
+      - pop
   orbit:
     build:
       context: orbit
@@ -66,13 +74,8 @@ services:
         target: /orbit/docs
         read_only: true
         selinux: z
-    ports:
-      - target: 9098
-        published: 9098
-        protocol: tcp
-        app_protocol: http
-        mode: host
-        name: "unencrypted http upstream server port"
+    networks:
+      - orbit
   smtp:
     build:
       context: smtp
@@ -89,13 +92,8 @@ services:
         target: /mnt/email_data
         read_only: false
         selinux: z
-    ports:
-      - target: 1465
-        published: 11465
-        protocol: tcp
-        app_protocol: smtp
-        mode: host
-        name: "unencrypted smtp upstream server port"
+    networks:
+      - smtp
   pop:
     build:
       context: pop
@@ -111,10 +109,9 @@ services:
         target: /mnt/mail
         read_only: true
         selinux: z
-    ports:
-      - target: 1995
-        published: 11995
-        protocol: tcp
-        app_protocol: pop3
-        mode: host
-        name: "unencrypted pop3 upstream server port"
+    networks:
+      - pop
+networks:
+  orbit:
+  smtp:
+  pop:
diff --git a/nginx_snippets/http/00-mail_auth.conf b/nginx_snippets/http/00-mail_auth.conf
index 0e5aafbe..eed4d5cf 100644
--- a/nginx_snippets/http/00-mail_auth.conf
+++ b/nginx_snippets/http/00-mail_auth.conf
@@ -3,7 +3,7 @@ server {
 	listen 127.0.0.1:13337 default_server;
 	location /mail_auth {
 		include uwsgi_params;
-		proxy_pass http://host.containers.internal:9098;
+		proxy_pass http://orbit:9098;
 	}
 
 	location = /mail_auth/pop {
diff --git a/nginx_snippets/server_https/01-orbit-paths.conf b/nginx_snippets/server_https/01-orbit-paths.conf
index 29f21b5b..84021ad2 100644
--- a/nginx_snippets/server_https/01-orbit-paths.conf
+++ b/nginx_snippets/server_https/01-orbit-paths.conf
@@ -8,5 +8,5 @@ location @login {
 location ~* ^((.*\.md)|/log(in|out)|/dashboard|/register|/cgit.*)$ {
 	include uwsgi_params;
 	proxy_intercept_errors on;
-	proxy_pass http://host.containers.internal:9098;
+	proxy_pass http://orbit:9098;
 }
diff --git a/nginx_snippets/stream/00-pop-proxy.conf b/nginx_snippets/stream/00-pop-proxy.conf
index 3abd6fc4..8959c75d 100644
--- a/nginx_snippets/stream/00-pop-proxy.conf
+++ b/nginx_snippets/stream/00-pop-proxy.conf
@@ -1,4 +1,4 @@
 server {
 	listen 127.0.0.1:2995;
-	proxy_pass host.containers.internal:11995;
+	proxy_pass pop:1995;
 }
diff --git a/nginx_snippets/stream/01-smtp-proxy.conf b/nginx_snippets/stream/01-smtp-proxy.conf
index 228be045..3fc3baff 100644
--- a/nginx_snippets/stream/01-smtp-proxy.conf
+++ b/nginx_snippets/stream/01-smtp-proxy.conf
@@ -1,4 +1,4 @@
 server {
 	listen 127.0.0.1:2465;
-	proxy_pass host.containers.internal:11465;
+	proxy_pass smtp:1465;
 }