diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2 b/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2
index c9e57af..057b8cf 100644
--- a/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2
+++ b/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2
@@ -82,3 +82,6 @@ readeck.local.cobb.lgbt {
 readeck.cobb.lgbt {
     reverse_proxy 10.69.2.52:8083
 }
+cwa.local.cobb.lgbt {
+    reverse_proxy 10.69.2.52:8086
+}
diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/calibre/tasks/main.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/calibre/tasks/main.yaml
index 1b624e0..83485fb 100644
--- a/collections/ansible_collections/adhdgirl/minilab/roles/calibre/tasks/main.yaml
+++ b/collections/ansible_collections/adhdgirl/minilab/roles/calibre/tasks/main.yaml
@@ -12,40 +12,27 @@
     - name: Ensure presense of folders for CWA stack
       tags: packages,docker,arr,sabnzbd
       ansible.builtin.file:
-        path: "/opt/arr/{{ item }}"
+        path: "/opt/calibre/{{ item }}"
         state: directory
         recurse: true
         owner: 1000
         group: 1000
       loop:
-        - "sabnzbd/config"
-        - "radarr/config"
-        - "sonarr/config"
-        - "lidarr/config"
-        - "prowlarr/config"
-        - "homarr/appdata"
-        - "doplarr"
-        - "whisparr/config"
+        - "automated/config"
+        - "automated/ingest"
+        - "automated/library"
     - name: Ensure compose files are properly loaded on the server
       tags: packages,docker,frigate
       ansible.builtin.template:
         src: docker-compose.yaml.j2
-        dest: /opt/frigate/docker-compose.yaml
-        owner: 1000
-        group: 1000
-        mode: "0644"
-    - name: Ensure frigate config is available for container
-      tags: packages,frigate
-      ansible.builtin.template:
-        src: frigate_config.yaml.j2
-        dest: /opt/frigate/config/config.yaml
+        dest: /opt/calibre/automated/docker-compose.yaml
         owner: 1000
         group: 1000
         mode: "0644"
     - name: Ensure docker containers are pulled and running
       tags: packages,docker,frigate
       community.docker.docker_compose_v2:
-        project_src: /opt/frigate
+        project_src: /opt/calibre/automated
         pull: policy
 
   rescue:
diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/calibre/templates/docker-compose.yaml.j2 b/collections/ansible_collections/adhdgirl/minilab/roles/calibre/templates/docker-compose.yaml.j2
index 7624bba..2c9c272 100644
--- a/collections/ansible_collections/adhdgirl/minilab/roles/calibre/templates/docker-compose.yaml.j2
+++ b/collections/ansible_collections/adhdgirl/minilab/roles/calibre/templates/docker-compose.yaml.j2
@@ -10,7 +10,7 @@ services:
       # Edit to match your current timezone https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
       - TZ=America/New_York
       # Hardcover API Key required for Hardcover as a Metadata Provider, get one here: https://docs.hardcover.app/api/getting-started/
-      - HARDCOVER_TOKEN=Bearer
+      - HARDCOVER_TOKEN=Bearer {{ calibre_hardcover_token }}
       # If your library is on a network share (e.g., NFS/SMB), disable WAL to reduce locking issues
       # Accepts: true/false (default: false)
       - NETWORK_SHARE_MODE=false
@@ -23,13 +23,13 @@ services:
       # This is an ingest dir, NOT a library one. Anything added here will be automatically added to your library according to the settings you have configured in CWA Settings page. All files placed here are REMOVED AFTER PROCESSING
       - /opt/calibre/automated/ingest:/cwa-book-ingest
       # If you don't have an existing library, CWA will automatically create one at the bind provided here
-      - /opt/calibre/automated/config:/calibre-library
+      - /opt/calibre/automated/library:/calibre-library
       # If you use calibre plugins, you can bind your plugins folder here to have CWA attempt to add them to its workflow (WIP)
       # If you are starting with a fresh install, you also need to copy customize.py.json to the Calibre config volume above, in /path/to/config/folder/.config/calibre/customize.py.json, see the note below for more info
-      - /opt/calibre/automated/config:/config/.config/calibre/plugins
+      - /opt/calibre/automated/config/.config/calibre/plugins:/config/.config/calibre/plugins
     ports:
       # Change the first number to change the port you want to access the Web UI, not the second
-      - 8083:8083
+      - 8086:8083
     # If you set CWA_PORT_OVERRIDE to a port below 1024, you may need to uncomment the following line:
     # cap_add:
     #   - NET_BIND_SERVICE
diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/calibre/vars/main.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/calibre/vars/main.yaml
index bb8bafd..5644314 100644
--- a/collections/ansible_collections/adhdgirl/minilab/roles/calibre/vars/main.yaml
+++ b/collections/ansible_collections/adhdgirl/minilab/roles/calibre/vars/main.yaml
@@ -1,2 +1,35 @@
 ---
 calibre_web_automated_image_tag: v4.0.6
+calibre_hardcover_token: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  35356139393437376232313931633137666662386437323933313063653231373734613632623239
+  3566363034663336353132326535363061346264323837370a353938663731383131376635363430
+  65623165666166393965316663373937393662376266663533613338343761646435333630336136
+  3038656565663363370a633061356666303038663836666462633236396638663265323336346431
+  35386331353639306635376461383133623264313435343034336433353531363964353262316164
+  37613133623138396361366465326237303434616233323032633562313931633463663536626237
+  37326638633461663738303931386239663362353938356164376434613531363832306233313737
+  63356534356566333835616665363336636538643834323130343533346234653939393735616130
+  30323337386235643138383933353738393661373331633136306439613234623562353830306162
+  31333663646239306562376662666439626264373939636433356563373561323763356464396566
+  33643264336463386162633738363564653838616231326131333964633963383731643636376632
+  30616534363366656165633761393539646339643862346463326662303534323235326663303963
+  34656433613530323239626330363733363132383532373162383533373337653834663133666638
+  61393534393730373161343639623235306638373735663163303930643765666537303164333939
+  66663561663634633563313636363338373337333033393730346162376431343934613663393162
+  38363338353563396237356235386566616539353931363534326139323633353936363230373762
+  65366437383936636436393163623065313939643231666364353765336238636664303535383735
+  39336166643634303963316435363738613831303135393834653661383663623663666161373362
+  38636438623834613937333534643337336233633663333862346361316262323132646531393635
+  65366534373733343536346639343433613336306336333761386466353132363137353939363964
+  66393535643130393064343836623830323165663261663534316661353239356539346437343134
+  32653462363233353237306565373035666434316238643962373437323331373432336266643366
+  34643439376539653130623638626333316263386363303035663530326664333963336239356235
+  66303666363630353333366666366238383334623033323131353935653965326536306332396138
+  31323333666365656634373036323135633964353630313938666237333161653031376130616237
+  66396463663938366535353666356565373435356163313539636139303738353131376162333763
+  39346463653066346538363462316661353933363630633633313963343362376435626333356237
+  66383330633639393431336232376233353930666334666164363438336361386165366635336433
+  35663030383665313838353863623666623739383663653332313163393534386565396133306364
+  31396662623437353231653962653066313935333532356634663231633138393132313535613438
+  303065326664663531623765353935376336
diff --git a/minilab.yaml b/minilab.yaml
index 025c671..b3c2ddc 100644
--- a/minilab.yaml
+++ b/minilab.yaml
@@ -60,6 +60,7 @@
     - adhdgirl.minilab.termix
     - adhdgirl.minilab.immich
     - adhdgirl.minilab.readeck
+    - adhdgirl.minilab.calibre
 - name: Configure frigate
   hosts: curren
   tags: docker,frigate