diff --git a/arr/compose.yaml b/arr/compose.yaml
index 6ecdcfe..d7f5df8 100644
--- a/arr/compose.yaml
+++ b/arr/compose.yaml
@@ -150,9 +150,9 @@ services:
       caddy.1_import: internal
       caddy.2_import: authentik
 
-  lidarr-audiobooks:
-    image: blampe/lidarr:latest
-    container_name: lidarr-audiobooks
+  readarr-audiobooks:
+    image: ghcr.io/firewalkwithm3/readarr:latest
+    container_name: readarr-audiobooks
     networks:
       - default
       - media
@@ -162,13 +162,31 @@ services:
       - PGID=1800
       - TZ=Australia/Perth
     volumes:
-      - /mnt/docker/lidarr-audiobooks/config:/config
+      - readarr-audiobooks_config:/config
       - /media:/media
     restart: unless-stopped
-    ports:
-      - 8686:8686
     labels:
-      caddy: lidarr-audiobooks.ferngarden.net
+      caddy: readarr-audiobooks.ferngarden.net
+      caddy.1_import: internal
+      caddy.2_import: authentik
+
+  readarr-ebooks:
+    image: ghcr.io/firewalkwithm3/readarr:latest
+    container_name: readarr-ebooks
+    networks:
+      - default
+      - media
+      - proxy
+    environment:
+      - PUID=1000
+      - PGID=1800
+      - TZ=Australia/Perth
+    volumes:
+      - readarr-ebooks_config:/config
+      - /media:/media
+    restart: unless-stopped
+    labels:
+      caddy: readarr-ebooks.ferngarden.net
       caddy.1_import: internal
       caddy.2_import: authentik
 
@@ -179,6 +197,7 @@ services:
       - PUID=1000
       - PGID=1800
       - TZ=Australia/Perth
+      - DOCKER_MODS=linuxserver/mods:universal-calibre|linuxserver/mods:lazylibrarian-ffmpeg #optional
     volumes:
       - /mnt/docker/lazylibrarian/data:/config
       - /media:/media
diff --git a/calibre/compose.yaml b/calibre/compose.yaml
index ff63359..f18e6ad 100644
--- a/calibre/compose.yaml
+++ b/calibre/compose.yaml
@@ -1,23 +1,43 @@
 services:
-  calibre-web-automated:
-    image: crocodilestick/calibre-web-automated:latest
-    container_name: calibre-web-automated
+  calibre:
+    image: lscr.io/linuxserver/calibre:latest
+    container_name: calibre
+    networks:
+      - default
+      - proxy
+      - media
+    security_opt:
+      - seccomp:unconfined
     environment:
       - PUID=1000
       - PGID=1800
       - TZ=Australia/Perth
     volumes:
-      - /mnt/docker/calibre-web-automated/config:/config 
-      - /media/media/calibre/ingest:/cwa-book-ingest
-      - /media/media/calibre/library:/calibre-library
+      - calibre_config:/config
+      - /media:/media
+    restart: unless-stopped
+    labels:
+      caddy: calibre.ferngarden.net
+      caddy.import: internal
+      caddy.reverse_proxy: "{{upstreams 8080}}"
+
+  calibre-web:
+    image: lscr.io/linuxserver/calibre-web:latest
+    container_name: calibre-web
     networks:
       - default
       - proxy
-      - media
+    environment:
+      - PUID=1000
+      - PGID=1800
+      - TZ=Australia/Perth
+    volumes:
+      - calibre-web_config:/config
+      - /media:/media
+    restart: unless-stopped
     labels:
       caddy: books.fern.garden
-      caddy.reverse_proxy: '{{ upstreams 8083 }}'
-    restart: unless-stopped
+      caddy.reverse_proxy: "{{upstreams 8083}}"
 
 networks:
   default:
@@ -25,3 +45,9 @@ networks:
     external: true
   media:
     external: true
+
+volumes:
+  calibre_config:
+    name: calibre_config
+  calibre-web_config:
+    name: calibre-web_config
diff --git a/kavita/compose.yaml b/kavita/compose.yaml
deleted file mode 100644
index 74aff9d..0000000
--- a/kavita/compose.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-services:
-  kavita:
-    image: lscr.io/linuxserver/kavita:latest
-    container_name: kavita
-    environment:
-      - PUID=1000
-      - PGID=1800
-      - TZ=Australia/Perth
-    volumes:
-      - /mnt/docker/kavita/config:/config
-      - /media:/media
-    ports:
-      - 5000:5000
-    networks:
-      - default
-      - proxy
-      - media
-    restart: unless-stopped
-
-networks:
-  default:
-  proxy:
-    external: true
-  media:
-    external: true
\ No newline at end of file
diff --git a/resources.toml b/resources.toml
index f2742f1..0197ec5 100644
--- a/resources.toml
+++ b/resources.toml
@@ -48,6 +48,8 @@ links = [
   "https://lidarr.ferngarden.net/",
   "https://prowlarr.ferngarden.net/",
   "https://radarr.ferngarden.net/",
+  "https://readarr-audiobooks.ferngarden.net/",
+  "https://readarr-ebooks.ferngarden.net/",
   "https://sonarr.ferngarden.net/"
 ]
 auto_update = true
@@ -110,11 +112,14 @@ CF_API_TOKEN=[[CLOUDFLARE_API_TOKEN]]
 ##
 
 [[stack]]
-name = "calibre-web-automated"
+name = "calibre"
 tags = ["media", "public"]
 [stack.config]
 server = "docker.local"
-links = ["https://books.fern.garden"]
+links = [
+  "https://calibre.ferngarden.net",
+  "https://books.fern.garden"
+]
 auto_update = true
 linked_repo = "github"
 run_directory = "calibre"
@@ -427,20 +432,6 @@ MOLLY_VAPID_PRIVKEY=[[MOLLY_VAPID_PRIVKEY]]
 
 ##
 
-[[stack]]
-name = "obsidian-livesync"
-tags = ["internal"]
-[stack.config]
-server = "docker.local"
-auto_update = true
-linked_repo = "github"
-run_directory = "obsidian-livesync"
-environment = """
-COUCHDB_PASSWORD=[[OBSIDIAN_LIVESYNC_DB_PASSWORD]]
-"""
-
-##
-
 [[stack]]
 name = "paperless"
 tags = ["internal"]
@@ -512,7 +503,6 @@ OIDC_CLIENT_SECRET=[[ROMM_OIDC_CLIENT_SECRET]]
 
 [[stack]]
 name = "scrutiny"
-tags = ["internal", "metrics"]
 [stack.config]
 server = "docker.local"
 auto_update = true
@@ -523,7 +513,6 @@ run_directory = "scrutiny"
 
 [[stack]]
 name = "slskd"
-tags = ["internal", "media"]
 [stack.config]
 server = "docker.local"
 poll_for_updates = true
@@ -618,21 +607,6 @@ image_registry.account = "firewalkwithm3"
 
 ##
 
-[[build]]
-name = "readarr"
-[build.config]
-builder = "docker.local"
-version = "0.4.18"
-auto_increment_version = false
-git_account = "firewalkwithm3"
-repo = "linuxserver/docker-readarr"
-branch = "develop"
-commit = "develop-0.4.18.2805-ls157"
-image_registry.domain = "ghcr.io"
-image_registry.account = "firewalkwithm3"
-
-##
-
 [[repo]]
 name = "github"
 [repo.config]