diff --git a/Caddyfile b/Caddyfile
index eee7be4..4c2e7cc 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -9,11 +9,6 @@ webtop.netgrimoire.com {
 
 }
 
-opnsense.netgrimoire.com {
-    import authentik
-    reverse_proxy https://192.168.3.4:8443 
-}
-
 
 jackett.netgrimoire.com {
     import authentik
diff --git a/JellyFin.yaml b/JellyFin.yaml
index 28d6672..8efc76a 100755
--- a/JellyFin.yaml
+++ b/JellyFin.yaml
@@ -5,12 +5,12 @@ services:
     image: lscr.io/linuxserver/jellyfin
     container_name: jellyfin
     environment:
-      - PUID=998
-      - PGID=1001
+      - PUID=1001
+      - PGID=998
       - TZ=America/Chicago
     volumes:
       - /DockerVol/Jellyfin/config:/config
-      - /data/nfs/Baxter:/data:shared   
+      - /data/nfs/Baxter/Data/media:/data:shared   
     ports:
       - 8096:8096
       - 8920:8920 
@@ -19,55 +19,91 @@ services:
     restart: unless-stopped
     networks:
       - netgrimoire
-        deploy:
+    deploy:
       labels:
-        - homepage.group=Jolly Roger
-        - homepage.name=Sabnzbd
-        - homepage.icon=sabnzbd.png
-        - homepage.href=http://sabnzbd.netgrimoire.com
-        - homepage.description=Usenet Downloader
-        - homepage.widget.type=sabnzbd
-        - homepage.widget.url=http://sabnzbd:8080
-        - homepage.widget.key=ac2fcd48264c0a113ef33ab593958a52
-        - kuma.sab.http.name="Sabnzbd"
-        - kuma.sab.http.url=http://sabnzbd:8080
-        - caddy=sabnzbd.netgrimoire.com
-        - caddy.import=authentik
-        - caddy.reverse_proxy="{{upstreams 8080}}"   
+        - homepage.group=Library
+        - homepage.name=JellyFin
+        - homepage.icon=jellyfin.png
+        - homepage.href=http://jellyfin.netgrimoire.com:8096
+        - homepage.description=Media Server
+        - kuma.jelly.http.name="Jellyfin"
+        - kuma.jelly.http.url=http://jellyfin:8096
+      placement:
+        constraints:
+          - node.hostname == bruce
 
-
-
-
-
-
-
-  jellyseerr:
+  jellyseer:
     image: fallenbagel/jellyseerr:latest
     container_name: jellyseerr
     hostname: jellyseer
     environment:
       - LOG_LEVEL=debug
-      - PUID=999
-      - PGID=1001
+      - PUID=1001
+      - PGID=998
       - TZ=America/Chicago
     ports:
         - 5055:5055
     volumes:
         - /DockerVol/JellySeer/config:/app/config
+        - /data/nfs/Baxter/Data/media:/data:shared   
     restart: unless-stopped
+    networks:
+      - netgrimoire
+    deploy:
+      labels:
+        - homepage.group=Library
+        - homepage.name=JellySeer
+        - homepage.icon=jellyseer.png
+        - homepage.href=http://requests.netgrimoire.com
+        - homepage.description=Media Server
+        - kuma.jellyseer.http.name="JellySeer"
+        - kuma.jellyseer.http.url=http://jellyseer:5055
+        - caddy=requests.netgrimoire.com
+        - caddy.import=authentik
+        - caddy.reverse_proxy="{{upstreams 5055}}"   
+      placement:
+        constraints:
+          - node.hostname == bruce
+
+
+
+
+
+
 
   wizarr:
     container_name: wizarr
     image: ghcr.io/wizarrrr/wizarr:latest
     hostname: wizarr
     environment:
-      - PUID=999
-      - PGID=1001
+      - PUID=1001
+      - PGID=998
       - TZ=America/Chicago
     ports:
       - 5690:5690
     volumes:
       - ./DockerVol/wizarr/database:/data/database
+    networks:
+      - netgrimoire
+    deploy:
+      labels:
+        - homepage.group=Library
+        - homepage.name=Wizarr
+        - homepage.icon=wizarr.png
+        - homepage.href=http://wizarr.netgrimoire.com
+        - homepage.description=Invitation Server
+        - kuma.wiz.http.name="Wizarr"
+        - kuma.wiz.http.url=http://wizarr:5690
+        - caddy=wizarr.netgrimoire.com
+        - caddy.import=authentik
+        - caddy.reverse_proxy="{{upstreams 5690}}"   
+      placement:
+        constraints:
+          - node.hostname == bruce
+
+
+
+
 
   jellystat-db:
     image: postgres:15.2
@@ -77,11 +113,17 @@ services:
       - POSTGRES_DB='jfstat'
       - POSTGRES_USER=jellystat
       - POSTGRES_PASSWORD=jellystat
-      - PUID=999
-      - PGID=1001
+      - PUID=1001
+      - PGID=998
       - TZ=America/Chicago
     volumes:
-    - /DockerVol/postgres/postgres-data:/var/lib/postgresql/data # Mounting the volume
+    - /DockerVol/jellystat/postgres-data:/var/lib/postgresql/data # Mounting the volume
+    networks:
+      - netgrimoire
+    deploy:
+      placement:
+        constraints:
+          - node.hostname == bruce
   
   jellystat:
     image: cyfershepard/jellystat:latest
@@ -94,30 +136,30 @@ services:
       POSTGRES_PORT: 5432
       JWT_SECRET: 'my-secret-jwt-key'
     ports:
-      - "3000:3000" #Server Port
+      - "3015:3000" #Server Port
     volumes:
       - /DockerVol/jellystat/backup-data:/app/backend/backup-data # Mounting the volume
-
     depends_on:
       - jellystat-db
+    networks:
+      - netgrimoire
+    deploy:
+      labels:
+        - homepage.group=Library
+        - homepage.name=JellyStat
+        - homepage.icon=jellystat.png
+        - homepage.href=http://jellystat.netgrimoire.com
+        - homepage.description=Jelly Stats
+        - kuma.jellystat.http.name="JellyStat"
+        - kuma.jellystat.http.url=http://jellystat:3000
+        - caddy=jellystat.netgrimoire.com
+        - caddy.import=authentik
+        - caddy.reverse_proxy="{{upstreams 3000}}"   
+      placement:
+        constraints:
+          - node.hostname == bruce
 
 
-  gaps:
-    image: housewrecker/gaps:latest
-    container_name: gaps
-    hostname: gaps
-    ports:
-      - 8484:8484
-      - 32400:32400
-    volumes:
-      - /DockerVol/gaps/data:/usr/data
-    environment:
-      - TZ=America/Chicago
-      - PGID=999
-      - PUID=1001 
-    labels:
-      com.centurylinklabs.watchtower.enable: "true"
-    restart: unless-stopped
 
 
 networks: