diff --git a/Caddyfile b/Caddyfile
index f2f63c6..433a078 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -45,6 +45,10 @@ metube.tomasrivera.ch {
   reverse_proxy metube:8081
 }
 
+videos.tomasrivera.ch {
+  reverse_proxy jellyfin:8096
+}
+
 books.tomasrivera.ch {
   reverse_proxy jelu:11111
 }
diff --git a/bootstrap.sh b/bootstrap.sh
index b45fa46..55b3503 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -159,7 +159,9 @@ mkdir -p \
     /opt/server/radicale/config \
     /opt/server/radicale/data \
     /opt/server/metube \
-    /opt/server/jelu
+    /opt/server/jelu \
+    /opt/server/jellyfin/config \
+    /opt/server/jellyfin/cache
 
 sudo chown -R 1000:1000 /opt/server/filebrowser # somehow filebrowser cant acces it
 
diff --git a/compose.yml b/compose.yml
index fd1d204..f8c09a4 100644
--- a/compose.yml
+++ b/compose.yml
@@ -10,6 +10,7 @@ services:
       - radicale
       - metube
       - jelu
+      - jellyfin
     image: caddy:latest
     container_name: caddy
     restart: unless-stopped
@@ -143,6 +144,24 @@ services:
       - TZ=Europe/Zurich
     volumes:
       - /opt/server/jelu:/data
+  jellyfin:
+    image: jellyfin/jellyfin:latest
+    container_name: jellyfin
+    restart: unless-stopped
+
+    environment:
+      - TZ=Europe/Zurich
+
+    volumes:
+      # Jellyfin configuration/database
+      - /opt/server/jellyfin/config:/config
+
+      # Transcoding cache
+      - /opt/server/jellyfin/cache:/cache
+
+      # Your MeTube archive (read-only)
+      - /mnt/kdrive/Autre/Archive/Videos:/media/videos:ro
+    mem_limit: 1500m
 volumes:
   caddy_data:
   caddy_config:
diff --git a/web-server/index.html b/web-server/index.html
index 636e49e..043c9e0 100644
--- a/web-server/index.html
+++ b/web-server/index.html
@@ -43,6 +43,11 @@
                         <td>Metube</td>
                         <td>Youtube archiver as ArchiveBox can't make yt-dlp work.</td>
                     </tr>
+                    <tr>
+                        <td><a href="https://videos.tomasrivera.ch">videos.tomasrivera.ch</a></td>
+                        <td>Jellyfin</td>
+                        <td>Media server</td>
+                    </tr>
                     <tr>
                         <td><a href="https://hledger.tomasrivera.ch">hledger.tomasrivera.ch</a></td>
                         <td>hledger-web</td>