diff --git a/bootstrap.docker-compose.macvlan.yml b/bootstrap.docker-compose.macvlan.yml
index e731ac3..ace2b64 100644
--- a/bootstrap.docker-compose.macvlan.yml
+++ b/bootstrap.docker-compose.macvlan.yml
@@ -2,7 +2,7 @@ services:
   traefik:
     networks:
       macvlan:
-        ipv4_address: ${NASCOMPOSE_MACVLAN_TRAEFIKIP}
+        ipv4_address: ${NASCOMPOSE_MACVLAN_TRAEFIK_IP}
 
 networks:
   macvlan:
@@ -16,4 +16,4 @@ networks:
           gateway: ${NASCOMPOSE_MACVLAN_GATEWAY?}
           ip_range: ${NASCOMPOSE_MACVLAN_RANGE?}
           aux_addresses:
-            nas: ${NASCOMPOSE_MACVLAN_HOSTIP?}
\ No newline at end of file
+            nas: ${NASCOMPOSE_MACVLAN_HOST_IP?}
diff --git a/bootstrap.docker-compose.yml b/bootstrap.docker-compose.yml
index 4d96a29..9642c1c 100644
--- a/bootstrap.docker-compose.yml
+++ b/bootstrap.docker-compose.yml
@@ -17,9 +17,9 @@ services:
   traefik:
     image: traefik
     networks:
+      - macvlan
       - traefik
       - docker
-      - macvlan
     ports:
       - 8080:8080
       - 8443:443
@@ -64,6 +64,10 @@ services:
       traefik.http.services.portainer.loadbalancer.server.scheme: https
 
 networks:
+  macvlan:
+    name: macvlan
+    labels:
+      nas-compose.boostrap: true
   docker:
     name: docker
     labels:
@@ -72,10 +76,6 @@ networks:
     name: traefik
     labels:
       nas-compose.boostrap: true
-  macvlan:
-    name: macvlan
-    labels:
-      nas-compose.boostrap: true
 
 volumes:
   portainer_data:
diff --git a/media.docker-compose.yml b/media.docker-compose.yml
index 2df84b2..8fda59c 100644
--- a/media.docker-compose.yml
+++ b/media.docker-compose.yml
@@ -10,16 +10,18 @@ services:
 
   plex:
     image: plexinc/pms-docker:plexpass
+    environment:
+      PLEX_CLAIM: ${NASCOMPOSE_PLEX_CLAIM}
     ports:
       - 32400:32400
     networks:
+      - macvlan
       - default
       - traefik
-      - macvlan
     volumes:
-      - plex_data:/data
-      - tv:/tv
-      - movies:/movies
+      - plex_config:/config
+      - tv:/data/tv
+      - movies:/data/movies
     restart: unless-stopped
     labels:
       traefik.enable: true
@@ -46,10 +48,10 @@ services:
   # Komga/Kavita
 
 networks:
-  traefik:
-    external: true
   macvlan:
     external: true
+  traefik:
+    external: true
 
 volumes:
   books:
@@ -76,6 +78,7 @@ volumes:
       type: none
       o: bind
       device: ${NASCOMPOSE_MEDIA?}/tv/
+  # TODO: Manage recycle bin properly...
   recycle_bin:
     name: recycle_bin
     driver_opts:
@@ -83,11 +86,11 @@ volumes:
       o: bind
       device: ${NASCOMPOSE_MEDIA?}/recycle_bin/
 
-  plex_data:
+  plex_config:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/plex/volumes/data/
+      device: ${NASCOMPOSE_SERVICES?}/plex/volumes/config/
   plaxt_keystore:
     driver_opts:
       type: none
diff --git a/nas-compose.env b/nas-compose.env
index 741bb02..e392705 100644
--- a/nas-compose.env
+++ b/nas-compose.env
@@ -1,6 +1,3 @@
-NASCOMPOSE_DOMAIN=
-NASCOMPOSE_DUCKDNS=
-
 COMPOSE_PROFILES=ebooks,plaxt,ombi
 
 NASCOMPOSE_SERVICES=
@@ -11,6 +8,11 @@ NASCOMPOSE_MACVLAN_IFACE=
 NASCOMPOSE_MACVLAN_SUBNET=
 NASCOMPOSE_MACVLAN_GATEWAY=
 NASCOMPOSE_MACVLAN_RANGE=
-NASCOMPOSE_MACVLAN_HOSTIP=
-
+NASCOMPOSE_MACVLAN_HOST_IP=
 NASCOMPOSE_MACVLAN_TRAEFIK_IP=
+
+NASCOMPOSE_TRAEFIK_DOMAIN=
+
+NASCOMPOSE_PLEX_CLAIM=
+
+NASCOMPOSE_DUCKDNS_DOMAIN=
diff --git a/services/traefik/configs/traefik.yml b/services/traefik/configs/traefik.yml
index ea6ead3..01295a3 100644
--- a/services/traefik/configs/traefik.yml
+++ b/services/traefik/configs/traefik.yml
@@ -3,7 +3,7 @@ providers:
     endpoint: tcp://docker:2375
     exposedByDefault: false
     network: traefik
-    defaultRule: Host(`{{ index .Labels "com.docker.compose.service" }}.{{ env `NASCOMPOSE_DOMAIN` }}`)
+    defaultRule: Host(`{{ index .Labels "com.docker.compose.service" }}.{{ env `NASCOMPOSE_TRAEFIK_DOMAIN` }}`)
   file:
     directory: /etc/traefik/dynamic/
 
diff --git a/services/traefik/volumes/config/traefik.yml b/services/traefik/volumes/config/traefik.yml
index 24a6c1d..a65fcbb 100644
--- a/services/traefik/volumes/config/traefik.yml
+++ b/services/traefik/volumes/config/traefik.yml
@@ -1,7 +1,7 @@
 http:
   routers:
     traefik:
-      rule: Host(`traefik.{{ env `NASCOMPOSE_DOMAIN` }}`)
+      rule: Host(`traefik.{{ env `NASCOMPOSE_TRAEFIK_DOMAIN` }}`)
       service: api@internal
       middlewares:
         - traefik-auth
diff --git a/utilities.docker-compose.yml b/utilities.docker-compose.yml
index ee78a77..914ea10 100644
--- a/utilities.docker-compose.yml
+++ b/utilities.docker-compose.yml
@@ -31,12 +31,15 @@ services:
   duckdns:
     image: linuxserver/duckdns
     environment:
-      - SUBDOMAINS=${NASCOMPOSE_DUCKDNS?}
+      - SUBDOMAINS=${NASCOMPOSE_DUCKDNS_DOMAIN?}
       - FILE__TOKEN=/run/secrets/duckdns_token
     secrets:
       - duckdns_token
     restart: unless-stopped
 
+  # TODO: Set up heimdal?
+  # TODO: Set up synology/external services?
+
 networks:
   docker:
     external: true