diff --git a/apps/komga/config.json b/apps/komga/config.json
new file mode 100644
index 00000000..ea0037b1
--- /dev/null
+++ b/apps/komga/config.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "../schema.json",
+  "name": "Komga",
+  "port": 2560,
+  "available": true,
+  "exposable": true,
+  "id": "komga",
+  "tipi_version": 1,
+  "version": "1.11.0",
+  "categories": [
+    "media"
+  ],
+  "description": "A media server for your comics, mangas, BDs, magazines and eBooks.",
+  "short_desc": "A media server for your comics, mangas, BDs, magazines and eBooks.",
+  "author": "gotson",
+  "source": "https://github.com/gotson/komga",
+  "website": "https://komga.org/",
+  "form_fields": [],
+  "supported_architectures": [
+    "arm64",
+    "amd64"
+  ]
+}
diff --git a/apps/komga/docker-compose.yml b/apps/komga/docker-compose.yml
new file mode 100644
index 00000000..fe48391a
--- /dev/null
+++ b/apps/komga/docker-compose.yml
@@ -0,0 +1,40 @@
+version: "3.9"
+services:
+  komga:
+    image: ghcr.io/gotson/komga:1.11.0
+    container_name: komga
+    volumes:
+      - ${APP_DATA_DIR}/data/config:/config
+      - ${APP_DATA_DIR}/data/data:/data
+    environment:
+      - TZ=${TZ}
+    ports:
+      - ${APP_PORT}:25600
+    networks:
+      - tipi_main_network
+    restart: unless-stopped
+    labels:
+      # Main
+      traefik.enable: true
+      traefik.http.middlewares.komga-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.komga.loadbalancer.server.port: 8080
+      # Web
+      traefik.http.routers.komga-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.komga-insecure.entrypoints: web
+      traefik.http.routers.komga-insecure.service: komga
+      traefik.http.routers.komga-insecure.middlewares: komga-web-redirect
+      # Websecure
+      traefik.http.routers.komga.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.komga.entrypoints: websecure
+      traefik.http.routers.komga.service: komga
+      traefik.http.routers.komga.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.komga-local-insecure.rule: Host(`komga.${LOCAL_DOMAIN}`)
+      traefik.http.routers.komga-local-insecure.entrypoints: web
+      traefik.http.routers.komga-local-insecure.service: komga
+      traefik.http.routers.komga-local-insecure.middlewares: komga-web-redirect
+      # Local domain secure
+      traefik.http.routers.komga-local.rule: Host(`komga.${LOCAL_DOMAIN}`)
+      traefik.http.routers.komga-local.entrypoints: websecure
+      traefik.http.routers.komga-local.service: komga
+      traefik.http.routers.komga-local.tls: true
diff --git a/apps/komga/metadata/description.md b/apps/komga/metadata/description.md
new file mode 100644
index 00000000..68d722d9
--- /dev/null
+++ b/apps/komga/metadata/description.md
@@ -0,0 +1,32 @@
+## Komga
+
+Komga is a media server for your comics, mangas, BDs, magazines and eBooks.
+
+### Chat on [Discord](https://discord.gg/TdRpkDu)
+
+### Features
+
+- Browse libraries, series and books via a responsive web UI that works on desktop, tablets and phones
+- Organize your library with collections and read lists
+- Edit metadata for your series and books
+- Import embedded metadata automatically
+- Webreader with multiple reading modes
+- Manage multiple users, with per-library access control, age restrictions, and labels restrictions
+- Offers a REST API, many community tools and scripts can interact with Komga
+- Download book files, whole series, or read lists
+- Duplicate files detection
+- Duplicate pages detection and removal
+- Import books from outside your libraries directly into your series folder
+- Import ComicRack `cbl` read lists
+
+### Documentation
+
+Head over to our [website](https://komga.org) for more information.
+
+### Develop in Komga
+
+Check the [development guidelines](./DEVELOPING.md).
+
+### Credits
+
+The Komga icon is based on an icon made by [Freepik](https://www.freepik.com/home) from [Flaticon](https://www.flaticon.com).
diff --git a/apps/komga/metadata/logo.jpg b/apps/komga/metadata/logo.jpg
new file mode 100644
index 00000000..381f0526
Binary files /dev/null and b/apps/komga/metadata/logo.jpg differ