diff --git a/bootstrap.docker-compose.macvlan.yml b/bootstrap.docker-compose.macvlan.yml
new file mode 100644
index 0000000..64d3b78
--- /dev/null
+++ b/bootstrap.docker-compose.macvlan.yml
@@ -0,0 +1,18 @@
+services:
+  traefik:
+    networks:
+      macvlan:
+        ipv4_address: ${NASCOMPOSE_MACVLAN_TRAEFIKIP}
+
+networks:
+  macvlan:
+    driver: macvlan
+    driver_opts:
+      parent: ${NASCOMPOSE_MACVLAN_IFACE?}
+    ipam:
+      config:
+        - subnet: ${NASCOMPOSE_MACVLAN_SUBNET?}
+          gateway: ${NASCOMPOSE_MACVLAN_GATEWAY?}
+          ip_range: ${NASCOMPOSE_MACVLAN_RANGE?}
+          aux_addresses:
+            nas: ${NASCOMPOSE_MACVLAN_HOSTIP?}
\ No newline at end of file
diff --git a/bootstrap.docker-compose.yml b/bootstrap.docker-compose.yml
index 8df72d7..76c5815 100644
--- a/bootstrap.docker-compose.yml
+++ b/bootstrap.docker-compose.yml
@@ -17,11 +17,9 @@ services:
   traefik:
     image: traefik
     networks:
-      traefik: {}
-      docker: {}
-      macvlan:
-        ipv4_address: ${NASCOMPOSE_TRAEFIK_IP}
-
+      - traefik
+      - docker
+      - macvlan
     environment:
       - NASCOMPOSE_DOMAIN=${NASCOMPOSE_DOMAIN?}
     # TODO: Move to configs?
@@ -72,7 +70,9 @@ networks:
     labels:
       nas-compose.boostrap: true
   macvlan:
-    external: true
+    name: macvlan
+    labels:
+      nas-compose.boostrap: true
 
 volumes:
   portainer_data:
diff --git a/nas-compose.env b/nas-compose.env
index cbeada0..fe6c871 100644
--- a/nas-compose.env
+++ b/nas-compose.env
@@ -6,3 +6,12 @@ COMPOSE_PROFILES=ebooks,plaxt,ombi
 NASCOMPOSE_SERVICES=
 NASCOMPOSE_DOWNLOADS=
 NASCOMPOSE_MEDIA=
+
+NASCOMPOSE_MACVLAN_IFACE=
+NASCOMPOSE_MACVLAN_SUBNET=
+NASCOMPOSE_MACVLAN_GATEWAY=
+NASCOMPOSE_MACVLAN_RANGE=
+NASCOMPOSE_MACVLAN_HOSTIP=
+
+NASCOMPOSE_MACVLAN_TRAEFIK_IP=
+NASCOMPOSE_MACVLAN_PlEX_IP=