diff --git a/files/caddyproxy/Caddyfile.j2 b/files/caddyproxy/Caddyfile.j2
index 03ce0b2..418e0b5 100644
--- a/files/caddyproxy/Caddyfile.j2
+++ b/files/caddyproxy/Caddyfile.j2
@@ -97,11 +97,11 @@ memos.vakhrushev.me {
     }
 }
 
-kavita.vakhrushev.me {
+calibre.vakhrushev.me {
     tls anwinged@ya.ru
 
     reverse_proxy {
-        to kavita_app:5000
+        to calibre_web_app:8083
     }
 }
 
diff --git a/files/calibre/docker-compose.template.yml b/files/calibre/docker-compose.template.yml
new file mode 100644
index 0000000..dfdc15f
--- /dev/null
+++ b/files/calibre/docker-compose.template.yml
@@ -0,0 +1,23 @@
+services:
+
+  calibre_web_app:
+    image: lscr.io/linuxserver/calibre-web:0.6.25
+    container_name: calibre_web_app
+    restart: unless-stopped
+    networks:
+      - "web_proxy_network"
+    volumes:
+      - "{{ config_dir }}:/config"
+      - "{{ books_dir }}:/books:ro"
+    environment:
+      - "PUID={{ owner_create_result.uid }}"
+      - "PGID={{ owner_create_result.group }}"
+      - TZ=Etc/UTC
+#      - DOCKER_MODS=linuxserver/mods:universal-calibre #optional
+#      - OAUTHLIB_RELAX_TOKEN_SCOPE=1 #optional
+#    ports:
+#      - 8083:8083
+
+networks:
+  web_proxy_network:
+    external: true
diff --git a/files/kavita/docker-compose.template.yml b/files/kavita/docker-compose.template.yml
deleted file mode 100644
index d64df85..0000000
--- a/files/kavita/docker-compose.template.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-services:
-
-  kavita:
-    image: jvmilazz0/kavita:0.8.9
-    container_name: kavita_app
-    user: "{{ owner_create_result.uid }}:{{ owner_create_result.group }}"
-    restart: unless-stopped
-    networks:
-      - "web_proxy_network"
-    volumes:
-      - "{{ books_fiction }}:/srv/books/fiction:ro"
-      - "{{ books_technical | path_join }}:/srv/books/technical:ro"
-      - "{{ books_comics | path_join }}:/srv/books/comics:ro"
-      - "{{ config_dir }}:/kavita/config"
-    environment:
-      - TZ=Europe/Moscow
-      - "PUID={{ owner_create_result.uid }}"
-      - "PGID={{ owner_create_result.group }}"
-#    ports:
-#      - "5000:5000"
-
-networks:
-  web_proxy_network:
-    external: true
diff --git a/playbook-kavita.yml b/playbook-calibre.yml
similarity index 80%
rename from playbook-kavita.yml
rename to playbook-calibre.yml
index d65e01c..95d8af6 100644
--- a/playbook-kavita.yml
+++ b/playbook-calibre.yml
@@ -1,22 +1,18 @@
 ---
-- name: "Configure kavita application"
+- name: "Configure calibre application"
   hosts: all
 
   vars_files:
     - vars/secrets.yml
 
   vars:
-    app_name: "kavita"
+    app_name: "calibre"
     app_user: "{{ app_name }}"
-    app_owner_uid: 1101
-    app_owner_gid: 1101
+    app_owner_uid: 1102
+    app_owner_gid: 1102
     base_dir: "{{ (application_dir, app_name) | path_join }}"
-    books_dir: "{{ (base_dir, 'books') | path_join }}"
     config_dir: "{{ (base_dir, 'config') | path_join }}"
-
-    books_fiction: "{{ (books_dir, 'fiction') | path_join }}"
-    books_technical: "{{ (books_dir, 'technical') | path_join }}"
-    books_comics: "{{ (books_dir, 'comics') | path_join }}"
+    books_dir: "{{ (base_dir, 'books') | path_join }}"
 
   tasks:
     - name: "Create user and environment"
@@ -39,9 +35,6 @@
         - "{{ base_dir }}"
         - "{{ books_dir }}"
         - "{{ config_dir }}"
-        - "{{ books_fiction }}"
-        - "{{ books_technical }}"
-        - "{{ books_comics }}"
 
     - name: "Create backup targets file"
       ansible.builtin.lineinfile: