diff --git a/docker-compose.yml b/docker-compose.yml
index 9163329..d802891 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,19 +30,19 @@ services:
       - 100.111.0.126
     restart: unless-stopped
 
-  ## Calibre (ebook management)
-  calibre-web:
-    image: lscr.io/linuxserver/calibre-web:latest
+  # Calibre (ebook management)
+  calibre-web-automated:
+    image: crocodilestick/calibre-web-automated:latest
     container_name: calibre-web
     environment:
       - PUID=1000
-      - PGID=1000
+      - PGID=100
       - TZ=America/Chicago
-      - DOCKER_MODS=linuxserver/mods:universal-calibre #optional
-      - OAUTHLIB_RELAX_TOKEN_SCOPE=1 #optional
+      - DOCKER_MODS=lscr.io/linuxserver/mods:universal-calibre-v7.16.0
     volumes:
       - /docker/calibre/config:/config
-      - /docker/calibre/books:/books
+      - /docker/calibre/ingest:/cwa-book-ingest
+      - /docker/calibre/books:/calibre-library
     ports:
       - 8083:8083
     dns:
@@ -512,6 +512,45 @@ services:
       - 6767:6767
     restart: unless-stopped
 
+  ## Calibre Downloader (ebook downloading)
+  calibre-dl:
+    image: ghcr.io/calibrain/calibre-web-automated-book-downloader:latest
+    container_name: calibre-dl
+    environment:
+      - FLASK_PORT=8084
+      - FLASK_DEBUG=false
+      - CLOUDFLARE_PROXY_URL=http://cf-bypass:8000
+      - INGEST_DIR=/cwa-book-ingest
+      - BOOK_LANGUAGE=en
+    ports:
+      - 8085:8084
+    volumes:
+      - /docker/calibre/ingest:/cwa-book-ingest
+    dns:
+      - 100.111.0.126
+    restart: unless-stopped
+  ## Cloudflare challenge bypass (for accessing Anna's Archive)
+  cf-bypass:
+    image: ghcr.io/sarperavci/cloudflarebypassforscraping:latest
+    container_name: cf-bypass
+    dns:
+      - 100.111.0.126
+    restart: unless-stopped
+
+  ## openbooks (IRC-based ebook downloading)
+  openbooks:
+    image: evanbuss/openbooks:latest
+    container_name: openbooks
+    command: --persist --name azpsen
+    ports:
+      - 8087:80
+    volumes:
+      # This works because calibre-web-automated fails to import .tmp files
+      - /docker/calibre/ingest/:/books
+    dns:
+      - 100.111.0.126
+    restart: unless-stopped
+
   ## Prowlarr (torrent indexer management)
   prowlarr:
     image: ghcr.io/linuxserver/prowlarr:nightly
diff --git a/readme.md b/readme.md
index 0f2d7ed..16eb8bc 100644
--- a/readme.md
+++ b/readme.md
@@ -18,7 +18,7 @@ These are all the services hosted, what they are for, and any clients I use with
 
 - [AudioBookShelf](https://www.audiobookshelf.org/) - Audiobook server
   - The official mobile client works great
-- [Calibre Web](https://github.com/janeczku/calibre-web) - Ebook management
+- [Calibre Web Automated](https://github.com/crocodilestick/Calibre-Web-Automated) - Ebook management
   - [Yomu](https://www.yomu-reader.com/) for iOS is nice and minimal and supports OPDS for use with Calibre Web
 - [Gitea](https://about.gitea.com/) - Git server - in the process of replacing my GitHub account
 - [Grocy](https://github.com/grocy/grocy) - Household management (Am I out of milk? Do I have AAA batteries? What can I make for dinner?)
@@ -67,9 +67,13 @@ These are all the services hosted, what they are for, and any clients I use with
 
 Note that I run tailscale as a system service, not in a container, so it is not listed here, but it is very useful for secure remote access - both for SSH and for services that don't need to be publicly visible.
 
+In `docker-compose.yml`, services that I access through tailscale need the `dns: 100.111.0.126` section in order to access the internet (`100.111.0.126` is the tailscale IP of the server).
+
 ### Downloading
 
 - [Bazarr](https://www.bazarr.media/) - Automated subtitle fetching (I also use the OpenSubtitles plugin within Jellyfin when needed, but this works hands-off most of the time)
+- [Calibre Web Book Downloader](https://github.com/calibrain/calibre-web-automated-book-downloader) - Automated ebook search and downloading
+- [openbooks](https://github.com/evan-buss/openbooks) - Automated IRC-based ebook search and downloading
 - [Prowlarr](https://prowlarr.com/) - Torrent indexer that interfaces with the other *arrs
 - [Radarr](https://radarr.video/) - Automated movie fetching
 - [qBittorrent](https://www.qbittorrent.org/) - The only torrent client I'll ever use