diff --git a/servapps/Kavita/cosmos-compose.json b/servapps/Kavita/cosmos-compose.json
new file mode 100644
index 00000000..4d9fa51c
--- /dev/null
+++ b/servapps/Kavita/cosmos-compose.json
@@ -0,0 +1,61 @@
+{
+  "cosmos-installer": {
+    "form": [
+      {
+        "name": "bookPath",
+        "label": "What is the path to your books? (leave empty to not mount anything)",
+        "initialValue": "{DefaultDataPath}/books",
+        "type": "text"
+      }
+    ]
+  },
+  "minVersion": "0.10.2",
+  "services": {
+    "{ServiceName}": {
+      "image": "lscr.io/linuxserver/kavita:latest",
+      "container_name": "{ServiceName}",
+      "restart": "unless-stopped",
+      "UID": 1000,
+      "GID": 1000,
+      "environment": [
+        "PUID=1000",
+        "PGID=1000",
+        "TZ=auto"
+      ],
+      "labels": {
+        "cosmos-force-network-secured": "true",
+        "cosmos-auto-update": "true",
+        "cosmos-icon": "https://azukaar.github.io/cosmos-servapps-official/servapps/Kavita/icon.png"
+      },
+      "volumes": [
+        {
+          "source": "{ServiceName}-config",
+          "target": "/config",
+          "type": "volume"
+        }
+        {if Context.bookPath}
+        , {
+          "source": "{Context.bookPath}",
+          "target": "/data/books",
+          "type": "bind"
+        }
+        {/if}
+      ],
+      "routes": [
+        {
+          "name": "{ServiceName}",
+          "description": "Expose {ServiceName} to the web",
+          "useHost": true,
+          "target": "http://{ServiceName}:5000",
+          "mode": "SERVAPP",
+          "Timeout": 14400000,
+          "ThrottlePerMinute": 12000,
+          "BlockCommonBots": true,
+          "SmartShield": {
+            "Enabled": true
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/servapps/Kavita/description.json b/servapps/Kavita/description.json
new file mode 100644
index 00000000..55a6135d
--- /dev/null
+++ b/servapps/Kavita/description.json
@@ -0,0 +1,9 @@
+{
+  "name": "Kavita",
+  "description": "https://wiki.kavitareader.com/) is a rocket fueled self-hosted digital library which supports a vast array of file formats. Install to start reading and share your server with your friends.",
+  "longDescription": "<p>Kavita is a full-fledged, fast, cross-platform, & open-source manga, comic, and book server. Built from the ground up with a focus on manga and a goal of being a full solution to your reading needs. Set up your own server and share your manga, comics, and e-book collection with your friends and family.</p>",
+  "tags": ["media", "server", "books", "ebooks", "android", "ios", "web", "browser", "media management", "media organizer", "media collection", "media library", "media manager"],
+  "repository": "https://github.com/linuxserver/docker-kavita",
+  "image": "https://hub.docker.com/r/linuxserver/kavita",
+  "supported_architectures": ["amd64", "arm64"]
+}
diff --git a/servapps/Kavita/icon.png b/servapps/Kavita/icon.png
new file mode 100644
index 00000000..60c7d5ee
Binary files /dev/null and b/servapps/Kavita/icon.png differ
diff --git a/servapps/Kavita/screenshots/1.png b/servapps/Kavita/screenshots/1.png
new file mode 100644
index 00000000..9af82543
Binary files /dev/null and b/servapps/Kavita/screenshots/1.png differ
diff --git a/servapps/Kavita/screenshots/2.png b/servapps/Kavita/screenshots/2.png
new file mode 100644
index 00000000..89dc1818
Binary files /dev/null and b/servapps/Kavita/screenshots/2.png differ
diff --git a/servapps/Kavita/screenshots/3.png b/servapps/Kavita/screenshots/3.png
new file mode 100644
index 00000000..93464a54
Binary files /dev/null and b/servapps/Kavita/screenshots/3.png differ
diff --git a/servapps/Kavita/screenshots/4.png b/servapps/Kavita/screenshots/4.png
new file mode 100644
index 00000000..94690349
Binary files /dev/null and b/servapps/Kavita/screenshots/4.png differ
diff --git a/servapps/Kavita/screenshots/5.png b/servapps/Kavita/screenshots/5.png
new file mode 100644
index 00000000..d3ae9b21
Binary files /dev/null and b/servapps/Kavita/screenshots/5.png differ
diff --git a/servapps/Kavita/screenshots/6.png b/servapps/Kavita/screenshots/6.png
new file mode 100644
index 00000000..d19f6337
Binary files /dev/null and b/servapps/Kavita/screenshots/6.png differ
diff --git a/servapps/Kavita/screenshots/7.png b/servapps/Kavita/screenshots/7.png
new file mode 100644
index 00000000..a9425e61
Binary files /dev/null and b/servapps/Kavita/screenshots/7.png differ
diff --git a/servapps/Kavita/screenshots/8.png b/servapps/Kavita/screenshots/8.png
new file mode 100644
index 00000000..09c23639
Binary files /dev/null and b/servapps/Kavita/screenshots/8.png differ