diff --git a/snackpot.yml b/snackpot.yml
index 9026c80..a232bdc 100644
--- a/snackpot.yml
+++ b/snackpot.yml
@@ -17,11 +17,15 @@
       - "22"
       - "80"
       - "443"
+      # jellyfin
+      - "8096"
+      #- "8920" https
+      - "7359"
       # minidlna
       - "8200"
       # upmpdcli
       - port: "49152"
-      # upnp (minidlna and upmpdcli)
+      # upnp (jellyfin, minidlna and upmpdcli)
       - proto: udp
         port: "1900"
       #  mopidy
diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml
index 15a3093..e8190b4 100644
--- a/templates/docker-compose/docker-compose.yml
+++ b/templates/docker-compose/docker-compose.yml
@@ -12,6 +12,8 @@ volumes:
   vhost.d:
   html:
   redis:
+  jellyfin_config:
+  jellyfin_cache:
   minidlna_state:
   minidlna_data:
   mopidy_data:
@@ -114,6 +116,18 @@ services:
     env_file:
       - letsencrypt-companion.env
 
+  jellyfin:
+    image: jellyfin/jellyfin:latest
+    restart: always
+    user: daemon:daemon
+    volumes:
+      - jellyfin_config:/config
+      - jellyfin_cache:/cache
+      - minidlna_data:/media
+    network_mode: host
+    environment:
+      - JELLYFIN_PublishedServerUrl=http://snackpot.local
+      
   minidlna:
     image: vladgh/minidlna:0.5
     restart: always
diff --git a/templates/docker-compose/mopidy b/templates/docker-compose/mopidy
index 3ba2b8c..f85b032 160000
--- a/templates/docker-compose/mopidy
+++ b/templates/docker-compose/mopidy
@@ -1 +1 @@
-Subproject commit 3ba2b8c06f8ef3213d6f7b3c3dc840fffe8808a0
+Subproject commit f85b032bb7d6643f462946d6f1d5f4493529eb9a