diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix
index 98a525f..2738aae 100644
--- a/hosts/ymir/configuration.nix
+++ b/hosts/ymir/configuration.nix
@@ -21,12 +21,9 @@
     blockBluesky = true;
     enableKDE = true;
     enableTailscale = true;
+    enableJellyfin = true;
   };
 
-  services.jellyfin = {
-    enable = true;
-    openFirewall = true;
-  };
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
diff --git a/modules/default.nix b/modules/default.nix
index 966daaf..5772328 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -7,6 +7,7 @@
     ./fonts.nix
     ./graphical-interface.nix
     ./i18n.nix
+    ./jellyfin.nix
     ./nix-settings.nix
     ./secrets.nix
     ./tailscale.nix
diff --git a/modules/jellyfin.nix b/modules/jellyfin.nix
new file mode 100644
index 0000000..3a4e391
--- /dev/null
+++ b/modules/jellyfin.nix
@@ -0,0 +1,29 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+
+  options = {
+    myModules.enableJellyfin = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Enable Jellyfin media server";
+      };
+    };
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf config.myModules.enableJellyfin {
+      services.jellyfin = {
+        enable = true;
+        openFirewall = true;
+
+      };
+
+      networking.firewall.allowedTCPPorts = [8096];
+    })
+  ];
+
+}
\ No newline at end of file