diff --git a/arr/compose.yaml b/arr/compose.yaml
index d7f5df8..6ecdcfe 100644
--- a/arr/compose.yaml
+++ b/arr/compose.yaml
@@ -150,9 +150,9 @@ services:
       caddy.1_import: internal
       caddy.2_import: authentik
 
-  readarr-audiobooks:
-    image: ghcr.io/firewalkwithm3/readarr:latest
-    container_name: readarr-audiobooks
+  lidarr-audiobooks:
+    image: blampe/lidarr:latest
+    container_name: lidarr-audiobooks
     networks:
       - default
       - media
@@ -162,31 +162,13 @@ services:
       - PGID=1800
       - TZ=Australia/Perth
     volumes:
-      - readarr-audiobooks_config:/config
+      - /mnt/docker/lidarr-audiobooks/config:/config
       - /media:/media
     restart: unless-stopped
+    ports:
+      - 8686:8686
     labels:
-      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: lidarr-audiobooks.ferngarden.net
       caddy.1_import: internal
       caddy.2_import: authentik
 
@@ -197,7 +179,6 @@ 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 f18e6ad..ff63359 100644
--- a/calibre/compose.yaml
+++ b/calibre/compose.yaml
@@ -1,43 +1,23 @@
 services:
-  calibre:
-    image: lscr.io/linuxserver/calibre:latest
-    container_name: calibre
+  calibre-web-automated:
+    image: crocodilestick/calibre-web-automated:latest
+    container_name: calibre-web-automated
+    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
     networks:
       - default
       - proxy
       - media
-    security_opt:
-      - seccomp:unconfined
-    environment:
-      - PUID=1000
-      - PGID=1800
-      - TZ=Australia/Perth
-    volumes:
-      - 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
-    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}}"
+      caddy.reverse_proxy: '{{ upstreams 8083 }}'
+    restart: unless-stopped
 
 networks:
   default:
@@ -45,9 +25,3 @@ 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
new file mode 100644
index 0000000..74aff9d
--- /dev/null
+++ b/kavita/compose.yaml
@@ -0,0 +1,25 @@
+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 0197ec5..f2742f1 100644
--- a/resources.toml
+++ b/resources.toml
@@ -48,8 +48,6 @@ 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
@@ -112,14 +110,11 @@ CF_API_TOKEN=[[CLOUDFLARE_API_TOKEN]]
 ##
 
 [[stack]]
-name = "calibre"
+name = "calibre-web-automated"
 tags = ["media", "public"]
 [stack.config]
 server = "docker.local"
-links = [
-  "https://calibre.ferngarden.net",
-  "https://books.fern.garden"
-]
+links = ["https://books.fern.garden"]
 auto_update = true
 linked_repo = "github"
 run_directory = "calibre"
@@ -432,6 +427,20 @@ 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"]
@@ -503,6 +512,7 @@ OIDC_CLIENT_SECRET=[[ROMM_OIDC_CLIENT_SECRET]]
 
 [[stack]]
 name = "scrutiny"
+tags = ["internal", "metrics"]
 [stack.config]
 server = "docker.local"
 auto_update = true
@@ -513,6 +523,7 @@ run_directory = "scrutiny"
 
 [[stack]]
 name = "slskd"
+tags = ["internal", "media"]
 [stack.config]
 server = "docker.local"
 poll_for_updates = true
@@ -607,6 +618,21 @@ 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]