diff --git a/flake.nix b/flake.nix
index 7ab0f80..19d4181 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,7 @@
         ./nix/user-quin.nix
         ./nix/gui1.nix
         ./nix/mega.nix
+        ./nix/jf-server.nix
       ];
     };
 
diff --git a/nix/jf-server.nix b/nix/jf-server.nix
new file mode 100644
index 0000000..f87ba27
--- /dev/null
+++ b/nix/jf-server.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, ... }:
+
+{
+  services.jellyfin = {
+    enable = true;
+    openFirewall = true;
+  };
+
+  environment.systemPackages = [
+    pkgs.jellyfin
+    pkgs.jellyfin-web
+    pkgs.jellyfin-ffmpeg
+  ];
+}
\ No newline at end of file
diff --git a/nix/qdhc.nix b/nix/qdhc.nix
index 4f4f553..a84ab52 100644
--- a/nix/qdhc.nix
+++ b/nix/qdhc.nix
@@ -66,7 +66,7 @@
     # supported GPUs is at: 
     # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus 
     # Only available from driver 515.43.04+
-    open = false;
+    open = true;
 
     # Enable the Nvidia settings menu,
 	  # accessible via `nvidia-settings`.
@@ -78,4 +78,5 @@
 
   users.users.qmoran.packages = with pkgs; [ nvtopPackages.nvidia ];
   hardware.nvidia-container-toolkit.enable = true;
+  virtualisation.docker.daemon.settings.features.cdi = true;
 }
\ No newline at end of file
diff --git a/src/docker-compose/all-down.sh b/src/docker-compose/all-down.sh
index 818fcea..55b4fe0 100755
--- a/src/docker-compose/all-down.sh
+++ b/src/docker-compose/all-down.sh
@@ -2,7 +2,6 @@
 
 SERVICE_NAMES=(
     "paperless"
-    "jellyfin"
     "immich"
     "navidrome"
     "downloadin"
diff --git a/src/docker-compose/all-pull.sh b/src/docker-compose/all-pull.sh
index bba9919..5ff47ba 100755
--- a/src/docker-compose/all-pull.sh
+++ b/src/docker-compose/all-pull.sh
@@ -2,7 +2,6 @@
 
 SERVICE_NAMES=(
     "paperless"
-    "jellyfin"
     "immich"
     "navidrome"
     "downloadin"
diff --git a/src/docker-compose/all-up.sh b/src/docker-compose/all-up.sh
index cdec559..aba877c 100755
--- a/src/docker-compose/all-up.sh
+++ b/src/docker-compose/all-up.sh
@@ -1,12 +1,11 @@
 #!/run/current-system/sw/bin/bash
 
 SERVICE_NAMES=(
-    "paperless"
-    "jellyfin"
-    "immich"
-    "navidrome"
+    # "paperless"
+    # "immich"
+    # "navidrome"
     # "downloadin"
-    "matrix"
+    # "matrix"
 )
 for SERVICE in "${SERVICE_NAMES[@]}"; do
     docker compose --env-file /etc/.soupclown.env -f $(pwd)/${SERVICE}-compose.yaml up -d
diff --git a/src/docker-compose/immich-compose.yaml b/src/docker-compose/immich-compose.yaml
index 5ab064a..b473cd5 100644
--- a/src/docker-compose/immich-compose.yaml
+++ b/src/docker-compose/immich-compose.yaml
@@ -22,7 +22,7 @@ services:
       - /mnt/mega/immich/old-album:/old-album
       - /etc/localtime:/etc/localtime:ro
     env_file:
-      - immich.env
+      - /etc/.soupclown.env
     ports:
       - "2283:2283"
     depends_on:
@@ -43,7 +43,7 @@ services:
     volumes:
       - model-cache:/cache
     env_file:
-      - immich.env
+      - /etc/.soupclown.env
     restart: always
     healthcheck:
       disable: false
diff --git a/src/docker-compose/jellyfin-compose.yaml b/src/docker-compose/jellyfin-compose.yaml
deleted file mode 100644
index 5346db5..0000000
--- a/src/docker-compose/jellyfin-compose.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-services:
-  jellyfin:
-    image: jellyfin/jellyfin
-    container_name: jellyfin
-    user: 1000:1000
-    ports:
-      - 8096:8096/tcp
-      - 7359:7359/udp
-    environment:
-      - TZ=America/New_York
-    volumes:
-      - /etc/jellyfin:/config
-      - /var/jellyfin-cache:/cache
-      - type: bind
-        source: /mnt/mega/jellyfinMedia
-        target: /media
-    runtime: nvidia
-    devices:
-      - /dev/nvidia-caps:/dev/nvidia-caps
-      - /dev/nvidia0:/dev/nvidia0
-      - /dev/nvidiactl:/dev/nvidiactl
-      - /dev/nvidia-modeset:/dev/nvidia-modeset
-      - /dev/nvidia-uvm:/dev/nvidia-uvm
-      - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: all
-              capabilities: [gpu]
-    restart: "always"