diff --git a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2 b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
index 59f6e1e..b26fbcb 100644
--- a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
+++ b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
@@ -53,7 +53,17 @@ overseerr.mvl.sh {
     tls {{ caddy_email }}
 }
 
-jellyfin.mvl.sh jellyfin.vleeuwen.me jf.vleeuwen.me jf.mvl.sh {
+plex.mvl.sh {
+    reverse_proxy plex:32400
+    tls {{ caddy_email }}
+}
+
+tautulli.mvl.sh {
+    reverse_proxy tautulli:8181
+    tls {{ caddy_email }}
+}
+
+jellyfin.mvl.sh jf.mvl.sh {
     reverse_proxy jellyfin:8096
     tls {{ caddy_email }}
 }
diff --git a/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2
index 60323ab..46d8887 100644
--- a/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2
@@ -13,6 +13,8 @@ services:
       - TZ=Europe/Amsterdam
       - PUID=1000
       - PGID=100
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     networks:
       - caddy_network
 
diff --git a/config/ansible/tasks/servers/services/plex/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/plex/docker-compose.yml.j2
index 6fd5108..76fd42e 100644
--- a/config/ansible/tasks/servers/services/plex/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/plex/docker-compose.yml.j2
@@ -1,7 +1,6 @@
 services:
   plex:
     image: plexinc/pms-docker:latest
-    container_name: plex
     environment:
       - PUID=1000
       - PGID=100
@@ -14,21 +13,10 @@ services:
       - /mnt/object_storage/tvshows:/tvshows
       - /mnt/object_storage/music:/music
     restart: unless-stopped
-    ports:
-      - 32400:32400/tcp
-      - 3005:3005/tcp
-      - 8324:8324/tcp
-      - 32469:32469/tcp
-      - 32410:32410/udp
-      - 32412:32412/udp
-      - 32413:32413/udp
-      - 32414:32414/udp
-    networks:
-      - caddy_network
+    network_mode: host
 
   tautulli:
     image: lscr.io/linuxserver/tautulli:latest
-    container_name: tautulli
     environment:
       - PUID=1000
       - PGID=100
diff --git a/config/ansible/tasks/servers/services/wireguard/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/wireguard/docker-compose.yml.j2
index 66c5fa0..1507258 100644
--- a/config/ansible/tasks/servers/services/wireguard/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/wireguard/docker-compose.yml.j2
@@ -8,7 +8,7 @@ services:
       - PGID=100
       - TZ=Europe/Amsterdam
       - SERVERURL=mvl.sh
-      - PEERS=work_laptop,phone,desktop,personal_laptop
+      - PEERS=worklaptop,phone,desktop,personallaptop
       - ALLOWEDIPS=0.0.0.0/0, ::/0
     volumes:
       - "{{ wireguard_data_dir }}/wg-data:/config"