diff --git a/homelab/fighter/config/calibre-web/.env b/homelab/fighter/config/calibre-web/.env
deleted file mode 100644
index baaa2263..00000000
--- a/homelab/fighter/config/calibre-web/.env
+++ /dev/null
@@ -1 +0,0 @@
-LIBRARY_DIR=/mnt/nas/calibre-web
\ No newline at end of file
diff --git a/homelab/fighter/config/calibre-web/docker-compose.yml b/homelab/fighter/config/calibre-web/docker-compose.yml
deleted file mode 100644
index 2f0f9a5f..00000000
--- a/homelab/fighter/config/calibre-web/docker-compose.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-services:
-  calibre-web-rpg:
-    image: linuxserver/calibre-web:latest
-    container_name: calibre-web_rpg
-    environment:
-      PUID: 1000
-      PGID: 1000
-      TZ: America/Los_Angeles
-    volumes:
-      - calibre-web-rpg_data:/config
-      - $LIBRARY_DIR/rpg:/books
-    labels:
-      - traefik.http.routers.calibre-rpg.rule=Host(`rpg.calibre.jafner.net`)
-      - traefik.http.routers.calibre-rpg.tls.certresolver=lets-encrypt
-      - homepage.group=Public
-      - homepage.name=RPG Library
-      - homepage.icon=Calibre-web.png
-      - homepage.href=https://rpg.calibre.jafner.net
-      - homepage.description=Library of RPG ebooks
-    networks:
-      - web
-
-  calibre-web-sff:
-    image: linuxserver/calibre-web:latest
-    container_name: calibre-web_sff
-    environment:
-      PUID: 1000
-      PGID: 1000
-      TZ: America/Los_Angeles
-    volumes:
-      - calibre-web-sff_data:/config
-      - $LIBRARY_DIR/sff:/books
-    labels:
-      - traefik.http.routers.calibre-sff.rule=Host(`sff.calibre.jafner.net`)
-      - traefik.http.routers.calibre-sff.tls.certresolver=lets-encrypt
-      - homepage.group=Public
-      - homepage.name=Science Fiction and Fantasy Library
-      - homepage.icon=Calibre-web.png
-      - homepage.href=https://sff.calibre.jafner.net
-      - homepage.description=Library of science fiction and fantasy books
-    networks:
-      - web
-
-networks:
-  web:
-    external: true
-volumes:
-  calibre-web-rpg_data:
-  calibre-web-sff_data:
-
diff --git a/homelab/stacks/books/.env b/homelab/stacks/books/.env
index b1c7f201..49b84b83 100644
--- a/homelab/stacks/books/.env
+++ b/homelab/stacks/books/.env
@@ -3,3 +3,4 @@ AUDIOBOOKS_LIBRARY=/mnt/nas/books/audiobooks
 DOCKER_DATA=/home/admin/data/books
 NZB_COMPLETED=/mnt/iscsi/barbarian/torrenting/NZB
 NZB_INCOMPLETE=/mnt/iscsi/barbarian/torrenting/NZB_incomplete
+LIBRARY_DIR=/mnt/nas/calibre-web
\ No newline at end of file
diff --git a/homelab/stacks/books/docker-compose.yml b/homelab/stacks/books/docker-compose.yml
index b0a2cc07..604951e6 100644
--- a/homelab/stacks/books/docker-compose.yml
+++ b/homelab/stacks/books/docker-compose.yml
@@ -1,5 +1,47 @@
 name: "books"
 services:
+  calibre-web-rpg:
+    image: linuxserver/calibre-web:latest
+    container_name: calibre-web_rpg
+    environment:
+      PUID: 1000
+      PGID: 1000
+      TZ: America/Los_Angeles
+    volumes:
+      - calibre-web-rpg_data:/config
+      - $LIBRARY_DIR/rpg:/books
+    labels:
+      - traefik.http.routers.calibre-rpg.rule=Host(`rpg.calibre.jafner.net`)
+      - traefik.http.routers.calibre-rpg.tls.certresolver=lets-encrypt
+      - homepage.group=Public
+      - homepage.name=RPG Library
+      - homepage.icon=Calibre-web.png
+      - homepage.href=https://rpg.calibre.jafner.net
+      - homepage.description=Library of RPG ebooks
+    networks:
+      - web
+
+  calibre-web-sff:
+    image: linuxserver/calibre-web:latest
+    container_name: calibre-web_sff
+    environment:
+      PUID: 1000
+      PGID: 1000
+      TZ: America/Los_Angeles
+    volumes:
+      - calibre-web-sff_data:/config
+      - $LIBRARY_DIR/sff:/books
+    labels:
+      - traefik.http.routers.calibre-sff.rule=Host(`sff.calibre.jafner.net`)
+      - traefik.http.routers.calibre-sff.tls.certresolver=lets-encrypt
+      - homepage.group=Public
+      - homepage.name=Science Fiction and Fantasy Library
+      - homepage.icon=Calibre-web.png
+      - homepage.href=https://sff.calibre.jafner.net
+      - homepage.description=Library of science fiction and fantasy books
+    networks:
+      - web
+  
   sabnzbd:
     image: linuxserver/sabnzbd:latest
     container_name: books_sabnzbd
@@ -89,3 +131,7 @@ services:
 networks:
   web:
     external: true
+
+volumes:
+  calibre-web-rpg_data:
+  calibre-web-sff_data:
\ No newline at end of file