diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml
index a46b585..a1d2667 100644
--- a/templates/docker-compose/docker-compose.yml
+++ b/templates/docker-compose/docker-compose.yml
@@ -19,8 +19,20 @@ volumes:
   mopidy_data:
 
 networks:
+  # This is for proxied containers
   proxy-tier:
-    
+  # This is for containers which need to be host mode
+  lan:
+    name: lan
+    driver: macvlan
+    driver_opts:
+      parent: enp3s0 # our ethernet interface
+    ipam:
+      config:
+        - gateway: 192.168.0.1
+          subnet: 192.168.0.0/24
+          ip_range: 192.168.0.240/29 # addresses 240-248 (6 usable)
+
 services:
 
   postgres:
@@ -125,8 +137,10 @@ services:
       - jellyfin_cache:/cache
       - minidlna_data:/media
     networks:
-      - proxy-tier
-      - default
+      proxy-tier:
+      default:
+      lan: # Static ip for the container on the macvlan net
+        ipv4_address: 192.168.0.241
     env_file:
       - jellyfin.env
       
@@ -136,7 +150,10 @@ services:
     volumes:
       - minidlna_state:/minidlna
       - minidlna_data:/media:ro
-    network_mode: host
+    networks:
+      default:
+      lan: # Static ip for the container on the macvlan net
+        ipv4_address: 192.168.0.242
     environment:
       - UPID=2000
       - UGID=2000
@@ -158,6 +175,8 @@ services:
       - mopidy_data:/data
       # Add local music folder
       - minidlna_data:/music:ro
+    networks:
+      default:
     devices:
       - /dev/snd
     restart: always
@@ -166,8 +185,10 @@ services:
     build: ./upmpdcli
     depends_on:
       - mopidy
-    # Host mode needed for advertisement
-    network_mode: host
+    networks:
+      default:
+      lan: # Static ip for the container on the macvlan net
+        ipv4_address: 192.168.0.243
     restart: always
 
       # Next three services adapted from
diff --git a/templates/docker-compose/mopidy b/templates/docker-compose/mopidy
index 3aa890f..b389297 160000
--- a/templates/docker-compose/mopidy
+++ b/templates/docker-compose/mopidy
@@ -1 +1 @@
-Subproject commit 3aa890f6a9d32044c10c82c904c0128f762969d0
+Subproject commit b389297213c795a906d5a1504e795f3c098a24f4
diff --git a/templates/docker-compose/upmpdcli/Dockerfile b/templates/docker-compose/upmpdcli/Dockerfile
index 72dcb5f..f7f1148 100644
--- a/templates/docker-compose/upmpdcli/Dockerfile
+++ b/templates/docker-compose/upmpdcli/Dockerfile
@@ -1,8 +1,9 @@
-FROM alpine:3.13
+FROM alpine:3.15
 
 RUN apk update \
   && apk upgrade \
   && apk add --no-cache \
+  --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
   --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
   python3 \
   openssl \
diff --git a/templates/docker-compose/upmpdcli/upmpdcli.conf b/templates/docker-compose/upmpdcli/upmpdcli.conf
index 850fd5a..98db63b 100644
--- a/templates/docker-compose/upmpdcli/upmpdcli.conf
+++ b/templates/docker-compose/upmpdcli/upmpdcli.conf
@@ -8,6 +8,7 @@
 #upnpiface =
 #upnpip = 
 # upnpport =
+upnpip = 192.168.0.243
 
 # media renderer parameters
 friendlyname = Snackpot
@@ -25,4 +26,4 @@ checkcontentformat = 0
 #mpdport = 6600
 #mpdpassword =
 #ownqueue = 1
-
+mpdhost = mopidy