diff --git a/machines/perception/configuration.nix b/machines/perception/configuration.nix
index b642e6a..6d90657 100644
--- a/machines/perception/configuration.nix
+++ b/machines/perception/configuration.nix
@@ -90,6 +90,19 @@
       volumes = [ "/var/lib/plex:/config" "/mnt/plex:/media" ];
       extraOptions = [ "--device=/dev/dri:/dev/dri" ];
     };
+    # Configure jellyfin
+    "jellyfin" = {
+      image = "lscr.io/linuxserver/jellyfin:latest";
+      environment = {
+        "PUID" = "1000";
+        "PGID" = "1000";
+        "TZ" = "America/New_York";
+        "JELLFIN_PublishedServerUrl" = "jellyfin.mccarty.io";
+      };
+      ports = [ "8096:8096" "8920:8920" ];
+      volumes = [ "/var/lib/jellyfin:/config" "/mnt/plex:/media" ];
+      extraOptions = [ "--device=/dev/dri:/dev/dri" ];
+    };
     # Configure tatulli - Plex Stats
     "tautulli" = {
       image = "lscr.io/linuxserver/tautulli:latest";
@@ -182,6 +195,7 @@
   # Make the containers depend on their mounts
   systemd.services = {
     "podman-plex" = { requires = [ "mnt-plex.mount" ]; };
+    "podman-jellyfin" = { requires = [ "mnt-plex.mount" ]; };
     "podman-sabnzbd" = { requires = [ "mnt-scratch.mount" ]; };
     "podman-lidarr" = { requires = [ "mnt-music.mount" ]; };
   };
diff --git a/machines/tounge/configuration.nix b/machines/tounge/configuration.nix
index 09a2241..efa2f5b 100644
--- a/machines/tounge/configuration.nix
+++ b/machines/tounge/configuration.nix
@@ -199,6 +199,17 @@
           '';
         };
       };
+      "jellyfin.mccarty.io" = {
+        forceSSL = true;
+        useACMEHost = "mccarty.io";
+        locations."/" = {
+          proxyPass = "http://100.121.150.78:8920";
+          extraConfig = ''
+            allow 100.64.0.0/10;
+            deny all;
+          '';
+        };
+      };
       "calibre.mccarty.io" = {
         forceSSL = true;
         useACMEHost = "mccarty.io";