diff --git a/docker-compose-caddy.yml b/docker-compose-caddy.yml
index 2bfeda8..b8f24d4 100644
--- a/docker-compose-caddy.yml
+++ b/docker-compose-caddy.yml
@@ -25,6 +25,9 @@ services:
     ports:
       # Do not directly expose the Django port to the internet, use the reverse proxy below instead
       # - "127.0.0.1:8000:8000"
+      # Caddy ports — declared here because wireguard-webadmin-caddy shares this network namespace
+      - "80:80"
+      - "443:443"
       # Warning: Docker will have a hard time handling large amount of ports. Expose only the ports that you need.
       # Ports for multiple WireGuard instances. (Probably, you just need one)
       - "51820-51839:51820-51839/udp"
@@ -74,9 +77,7 @@ services:
   wireguard-webadmin-caddy:
     container_name: wireguard-webadmin-caddy
     restart: unless-stopped
-    build:
-      context: ./containers/caddy
-      dockerfile: Dockerfile-caddy
+    image: eduardosilva/wireguard_webadmin_caddy:latest
     environment:
       - SERVER_ADDRESS=${SERVER_ADDRESS}
       - EXTRA_ALLOWED_HOSTS=${EXTRA_ALLOWED_HOSTS}
@@ -86,9 +87,7 @@ services:
       - caddy_json_export:/caddy_json_export
       - caddy_data:/data
       - caddy_config:/config
-    ports:
-      - "80:80"
-      - "443:443"
+    network_mode: "service:wireguard-webadmin"
     depends_on:
       - wireguard-webadmin
       - wireguard-webadmin-auth-gateway
@@ -96,9 +95,7 @@ services:
   wireguard-webadmin-auth-gateway:
     container_name: wireguard-webadmin-auth-gateway
     restart: unless-stopped
-    build:
-      context: ./containers/auth-gateway
-      dockerfile: Dockerfile-auth-gateway
+    image: eduardosilva/wireguard_webadmin_auth_gateway:latest
     environment:
       - TZ=${TIMEZONE}
       - AUTH_GATEWAY_CONFIG_DIR=/caddy_json_export
diff --git a/docker-compose-no-nginx.yml b/docker-compose-no-caddy.yml
similarity index 100%
rename from docker-compose-no-nginx.yml
rename to docker-compose-no-caddy.yml
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 96f7806..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-version: '3'
-services:
-  wireguard-webadmin:
-    container_name: wireguard-webadmin
-    restart: unless-stopped
-    image: eduardosilva/wireguard_webadmin:latest
-    environment:
-      - SERVER_ADDRESS=${SERVER_ADDRESS}
-      - DEBUG_MODE=${DEBUG_MODE}
-      - COMPOSE_VERSION=c1c
-      - TZ=${TIMEZONE}
-      - EXTRA_ALLOWED_HOSTS=${EXTRA_ALLOWED_HOSTS}
-      - WIREGUARD_STATUS_CACHE_ENABLED=${WIREGUARD_STATUS_CACHE_ENABLED}
-      - WIREGUARD_STATUS_CACHE_WEB_LOAD_PREVIOUS_COUNT=${WIREGUARD_STATUS_CACHE_WEB_LOAD_PREVIOUS_COUNT}
-      - WIREGUARD_STATUS_CACHE_REFRESH_INTERVAL=${WIREGUARD_STATUS_CACHE_REFRESH_INTERVAL}
-      - VPN_CLIENTS_CAN_ACCESS_DJANGO=${VPN_CLIENTS_CAN_ACCESS_DJANGO}
-    volumes:
-      - wireguard:/etc/wireguard
-      - static_volume:/app_static_files/
-      - dnsmasq_conf:/etc/dnsmasq
-      - app_secrets:/app_secrets/
-      - rrd_data:/rrd_data/
-    ports:
-      # Do not directly expose the Django port to the internet, use the reverse proxy below instead
-      # - "127.0.0.1:8000:8000"
-      # Warning: Docker will have a hard time handling large amount of ports. Expose only the ports that you need.
-      # Ports for multiple WireGuard instances. (Probably, you just need one)
-      - "51820-51839:51820-51839/udp"
-      # Ports for port forwarding rules. Add your own ports here if you need them.
-      - "8080-8089:8080-8089/tcp"
-    cap_add:
-      - NET_ADMIN
-      - SYS_MODULE
-    sysctls:
-      - net.ipv4.conf.all.src_valid_mark=1
-      - net.ipv4.ip_forward=1
-    command: /bin/bash /app/init.sh
-
-  wireguard-webadmin-cron:
-    container_name: wireguard-webadmin-cron
-    restart: unless-stopped
-    image: eduardosilva/wireguard_webadmin_cron:latest
-    environment:
-      - TZ=${TIMEZONE}
-      - WIREGUARD_STATUS_CACHE_REFRESH_INTERVAL=${WIREGUARD_STATUS_CACHE_REFRESH_INTERVAL}
-    volumes:
-      - app_secrets:/app_secrets/
-    depends_on:
-      - wireguard-webadmin
-
-  wireguard-webadmin-rrdtool:
-    container_name: wireguard-webadmin-rrdtool
-    restart: unless-stopped
-    image: eduardosilva/wireguard_webadmin_rrdtool:latest
-    volumes:
-      - app_secrets:/app_secrets/
-      - rrd_data:/rrd_data/
-    environment:
-      - TZ=${TIMEZONE}
-    depends_on:
-      - wireguard-webadmin
-
-  wireguard-webadmin-dns:
-    container_name: wireguard-webadmin-dns
-    restart: unless-stopped
-    image: eduardosilva/wireguard_webadmin_dns:latest
-    environment:
-      - TZ=${TIMEZONE}
-    volumes:
-      - dnsmasq_conf:/etc/dnsmasq/
-
-  wireguard-webadmin-nginx:
-    container_name: wireguard-webadmin-nginx
-    restart: unless-stopped
-    image: eduardosilva/wireguard_webadmin_nginx:latest
-    volumes:
-      - static_volume:/static
-      - https_cert:/certificate
-    environment:
-      - TZ=${TIMEZONE}
-    ports:
-      - "80:80"
-      - "443:443"
-
-volumes:
-  static_volume:
-  https_cert:
-  wireguard:
-  dnsmasq_conf:
-  app_secrets:
-  rrd_data: