diff --git a/media-management.yaml b/media-management.yaml
index 9a0117f..e8c6229 100644
--- a/media-management.yaml
+++ b/media-management.yaml
@@ -48,9 +48,9 @@ services:
       - TP_THEME=$THEME
 
   # Books
-  readarr-ebooks:
-    image: lscr.io/linuxserver/readarr:develop
-    container_name: readarr-books
+  bookshelf-ebooks:
+    image: ghcr.io/pennydreadful/bookshelf:hardcover
+    container_name: bookshelf-books
     restart: unless-stopped
     volumes:
       - /dockers/readarr-ebooks/data:/config
@@ -63,9 +63,9 @@ services:
       - DOCKER_MODS=ghcr.io/gilbn/theme.park:readarr
       - TP_THEME=$THEME
 
-  readarr-abooks:
-    image: lscr.io/linuxserver/readarr:develop
-    container_name: readarr-audio
+  bookshelf-abooks:
+    image: ghcr.io/pennydreadful/bookshelf:hardcover
+    container_name: bookshelf-audio
     restart: unless-stopped
     volumes:
       - /dockers/readarr-abooks/data:/config