diff --git a/arr/compose.yaml b/arr/compose.yaml
index 5baf01b..6ecdcfe 100644
--- a/arr/compose.yaml
+++ b/arr/compose.yaml
@@ -150,20 +150,45 @@ services:
       caddy.1_import: internal
       caddy.2_import: authentik
 
-  kapowarr:
-    container_name: kapowarr
-    image: mrcas/kapowarr:latest
-    volumes:
-      - /mnt/docker/kapowarr/database:/app/db
-      - /media:/media
+  lidarr-audiobooks:
+    image: blampe/lidarr:latest
+    container_name: lidarr-audiobooks
     networks:
       - default
       - media
       - proxy
+    environment:
+      - PUID=1000
+      - PGID=1800
+      - TZ=Australia/Perth
+    volumes:
+      - /mnt/docker/lidarr-audiobooks/config:/config
+      - /media:/media
+    restart: unless-stopped
+    ports:
+      - 8686:8686
     labels:
-      caddy: kapowarr.ferngarden.net
-      caddy.import: internal
-      caddy.reverse_proxy: '{{ upstreams 5656 }}'
+      caddy: lidarr-audiobooks.ferngarden.net
+      caddy.1_import: internal
+      caddy.2_import: authentik
+
+  lazylibrarian:
+    image: lscr.io/linuxserver/lazylibrarian:latest
+    container_name: lazylibrarian
+    environment:
+      - PUID=1000
+      - PGID=1800
+      - TZ=Australia/Perth
+    volumes:
+      - /mnt/docker/lazylibrarian/data:/config
+      - /media:/media
+    networks:
+      - default
+      - proxy
+      - media
+    ports:
+      - 5299:5299
+    restart: unless-stopped
 
   letterboxd-list-radarr:
     image: screeny05/letterboxd-list-radarr:latest
@@ -247,6 +272,8 @@ networks:
 volumes:
   bazarr_config:
     name: bazarr_config
+  beets_config:
+    name: beets_config
   cleanuperr_config:
     name: cleanuperr_config
   cleanuperr_logs:
@@ -267,5 +294,9 @@ volumes:
     name: prowlarr_config
   radarr_config:
     name: radarr_config
+  readarr-audiobooks_config:
+    name: readarr-audiobooks_config
+  readarr-ebooks_config:
+    name: readarr-ebooks_config
   sonarr_config:
     name: sonarr_config
diff --git a/calibre/compose.yaml b/calibre/compose.yaml
index c71c2ea..ff63359 100644
--- a/calibre/compose.yaml
+++ b/calibre/compose.yaml
@@ -19,32 +19,6 @@ services:
       caddy.reverse_proxy: '{{ upstreams 8083 }}'
     restart: unless-stopped
 
-  cwa-downloader:
-    image: ghcr.io/calibrain/calibre-web-automated-book-downloader:latest
-    container_name: cwa-downloader
-    environment:
-      FLASK_PORT: 8084
-      LOG_LEVEL: info
-      BOOK_LANGUAGE: en
-      USE_BOOK_TITLE: true
-      TZ: Australia/Perth
-      APP_ENV: prod
-      UID: 1000
-      GID: 1800
-      CWA_DB_PATH: /auth/app.db
-    networks:
-      - default
-      - media
-      - proxy
-    restart: unless-stopped
-    volumes:
-      - /media/media/calibre/ingest:/cwa-book-ingest
-      - /mnt/docker/calibre-web-automated/downloader/app.db:/auth/app.db:ro
-    labels:
-      caddy: books-dl.ferngarden.net
-      caddy.import: internal
-      cadyd.reverse_proxy: '{{ upstreams 8084 }}'
-
 networks:
   default:
   proxy:
diff --git a/glance/compose.yaml b/glance/compose.yaml
new file mode 100644
index 0000000..89f5a52
--- /dev/null
+++ b/glance/compose.yaml
@@ -0,0 +1,19 @@
+services:
+  glance:
+    container_name: glance
+    image: glanceapp/glance
+    restart: unless-stopped
+    volumes:
+      - /mnt/docker/glance/config:/app/config
+    networks:
+      - default
+      - proxy
+    labels:
+      caddy: glance.ferngarden.net
+      caddy.import: internal
+      caddy.reverse_proxy: '{{ upstreams 8080 }}'
+
+networks:
+  default:
+  proxy:
+    external: true
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/obsidian-livesync/compose.yaml b/obsidian-livesync/compose.yaml
new file mode 100644
index 0000000..1abce43
--- /dev/null
+++ b/obsidian-livesync/compose.yaml
@@ -0,0 +1,27 @@
+services:
+  obsidian-livesync:
+    container_name: obsidian-livesync
+    image: couchdb:latest
+    user: 1000:1000
+    environment:
+      - TZ=Australia/Perth
+      - COUCHDB_USER=obsidian
+      - COUCHDB_PASSWORD=${COUCHDB_PASSWORD}
+    volumes:
+      - /mnt/docker/obsidian-livesync/data:/opt/couchdb/data
+      - /mnt/docker/obsidian-livesync/etc/local.d:/opt/couchdb/etc/local.d
+    ports:
+      - 5984:5984
+    networks:
+      - default
+      - proxy
+    restart: unless-stopped
+    labels:
+      caddy: obsidian-livesync.ferngarden.net
+      caddy.import: internal
+      caddy.reverse_proxy: '{{ upstreams 5984 }}'
+
+networks:
+  default:
+  proxy:
+    external: true
\ No newline at end of file