diff --git a/docker-compose.yml b/docker-compose.yml
index 5264b2d..9c9515b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,6 +32,7 @@ include:
   - services/handbrake-server.yml
   - services/redlib.yml
   - services/calibre-web.yml
+  - services/kavita.yml
 
 services:
   caddy:
diff --git a/kavita.env b/kavita.env
deleted file mode 100644
index efdcf9e..0000000
--- a/kavita.env
+++ /dev/null
@@ -1,2 +0,0 @@
-KAVITA_INTERNAL_PORT=5000
-KAVITA_EXTERNAL_PORT=5100
diff --git a/services/kavita.yml b/services/kavita.yml
new file mode 100644
index 0000000..4e9e1e7
--- /dev/null
+++ b/services/kavita.yml
@@ -0,0 +1,21 @@
+---
+services:
+  kavita:
+    image: ghcr.io/kareadita/kavita:latest 
+    container_name: kavita
+    networks:
+      public:
+        ipv4_address: 192.168.240.53
+    ports:
+      - ${KAVITA_EXTERNAL_PORT}:${KAVITA_INTERNAL_PORT}
+    labels:
+      caddy: kavita.${DOMAIN}
+      caddy.reverse_proxy: "{{ upstreams $KAVITA_INTERNAL_PORT }}"
+    environment:
+      - DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true
+    volumes:
+      - "${STORAGE_PATH}/media/comics:/comics"
+      - "${STORAGE_PATH}/media/comics/manga:/manga"
+      - "${STORAGE_PATH}/media/comics/books:/books"
+      - "${DOCKER_STORAGE_PATH}/kavita:/kavita/config"
+    restart: unless-stopped