diff --git a/main.yml b/main.yml
index 0573436..fbd1468 100644
--- a/main.yml
+++ b/main.yml
@@ -82,12 +82,9 @@
     - name: Deploy QBittorrent
       import_tasks: tasks/qbittorrent.yml
       tags: qbittorrent_deploy
-    - name: Deploy Calibre
-      import_tasks: tasks/calibre-web.yml
-      tags: calibre-web_deploy
-    - name: Deploy Ubooquity
-      import_tasks: tasks/ubooquity.yml
-      tags: ubooquity_deploy
+    - name: Deploy Kavita
+      import_tasks: tasks/kavita.yml
+      tags: kavita_deploy
 
 - hosts: jackson
 
diff --git a/tasks/calibre-web.yml b/tasks/calibre-web.yml
deleted file mode 100644
index 2367552..0000000
--- a/tasks/calibre-web.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/calibre"
-
-- name: Pull latest Calibre-Web Docker Image
-  docker_image:
-    name: lscr.io/linuxserver/calibre-web
-    tag: latest
-    source: pull
-
-- name: Deploy Calibre-Web Docker Container
-  docker_container:
-    name: calibre
-    image: lscr.io/linuxserver/calibre-web
-    recreate: true
-    restart_policy: unless-stopped
-    volumes:
-      - "{{ data_dir }}/calibre:/config"
-      - "{{ media_path }}/Books/Novels:/books"
-    env:
-      PUID: "{{ PUID }}"
-      PGID: "{{ PGID }}"
-      TZ: "{{ TZ }}"
-      DOCKER_MODS: linuxserver/mods:universal-calibre
-    networks:
-      - name: homelab
-    # labels:
-    # traefik.enable: "true"
-    # traefik.http.routers.read.rule: Host(`read.fntz.net`)
-    # traefik.http.routers.read.entrypoints: webSecure
-    # traefik.http.routers.read.tls.certresolver: letsencrypt
-    # traefik.http.services.read.loadbalancer.server.port: "8083"
diff --git a/tasks/kavita.yml b/tasks/kavita.yml
new file mode 100644
index 0000000..2c11a80
--- /dev/null
+++ b/tasks/kavita.yml
@@ -0,0 +1,35 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_dir }}/kavita"
+
+- name: Pull latest Kavita Docker Image
+  docker_image:
+    name: lscr.io/linuxserver/kavita
+    tag: latest
+    source: pull
+
+- name: Deploy Kavita Docker Container
+  docker_container:
+    name: kavita
+    image: lscr.io/linuxserver/kavita
+    recreate: true
+    restart_policy: unless-stopped
+    volumes:
+      - "{{ data_dir }}/kavita:/config"
+      - "{{ media_path }}/Books:/books"
+    env:
+      PUID: "{{ PUID }}"
+      PGID: "{{ PGID }}"
+      TZ: "{{ TZ }}"
+    networks:
+      - name: homelab
+    labels:
+    traefik.enable: "true"
+    traefik.http.routers.read.rule: Host(`read.fntz.net`)
+    traefik.http.routers.read.entrypoints: webSecure
+    traefik.http.routers.read.tls.certresolver: letsencrypt
+    traefik.http.services.read.loadbalancer.server.port: "5000"
diff --git a/tasks/ubooquity.yml b/tasks/ubooquity.yml
deleted file mode 100644
index b468a1f..0000000
--- a/tasks/ubooquity.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/ubooquity"
-
-- name: Pull latest Ubooquity Docker Image
-  docker_image:
-    name: lscr.io/linuxserver/ubooquity
-    tag: latest
-    source: pull
-
-- name: Deploy Ubooquity Docker Container
-  docker_container:
-    name: calibre
-    image: lscr.io/linuxserver/ubooquity
-    recreate: true
-    restart_policy: unless-stopped
-    volumes:
-      - "{{ data_dir }}/ubooquity:/config"
-      - "{{ media_path }}/Books:/books"
-    env:
-      PUID: "{{ PUID }}"
-      PGID: "{{ PGID }}"
-      TZ: "{{ TZ }}"
-    networks:
-      - name: homelab
-    labels:
-      traefik.enable: "true"
-
-      traefik.http.routers.read.rule: Host(`read.fntz.net`)
-      traefik.http.routers.read.entrypoints: webSecure
-      traefik.http.routers.read.tls.certresolver: letsencrypt
-      traefik.http.services.read.loadbalancer.server.port: "2202"