diff --git a/apps/komga/1.18.0/data.yml b/apps/komga/1.18.0/data.yml
new file mode 100644
index 000000000..882c92c89
--- /dev/null
+++ b/apps/komga/1.18.0/data.yml
@@ -0,0 +1,17 @@
+additionalProperties:
+  formFields:
+    - default: "/home/komga"
+      edit: true
+      envKey: KOMGA_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: 25600
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: WebUI 端口
+      labelEn: WebUI port
+      required: true
+      rule: paramPort
+      type: number
diff --git a/apps/komga/1.18.0/docker-compose.yml b/apps/komga/1.18.0/docker-compose.yml
new file mode 100644
index 000000000..639696ef8
--- /dev/null
+++ b/apps/komga/1.18.0/docker-compose.yml
@@ -0,0 +1,24 @@
+networks:
+  1panel-network:
+    external: true
+
+services:
+  komga:
+    image: gotson/komga:1.18.0
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    restart: always
+    user: 1000:1000
+    networks:
+      - 1panel-network
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:25600
+    env_file:
+      - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
+    volumes:
+      - ${KOMGA_ROOT_PATH}/config:/config
+      - ${KOMGA_ROOT_PATH}/data:/data
+    environment:
+      - TZ=Asia/Shanghai
diff --git a/apps/komga/1.18.0/envs/default.env b/apps/komga/1.18.0/envs/default.env
new file mode 100644
index 000000000..cd05f46e6
--- /dev/null
+++ b/apps/komga/1.18.0/envs/default.env
@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+ENV_FILE=.env
diff --git a/apps/komga/1.18.0/envs/global.env b/apps/komga/1.18.0/envs/global.env
new file mode 100644
index 000000000..e10989fe4
--- /dev/null
+++ b/apps/komga/1.18.0/envs/global.env
@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+TZ=Asia/Shanghai
diff --git a/apps/komga/1.18.0/scripts/init.sh b/apps/komga/1.18.0/scripts/init.sh
new file mode 100644
index 000000000..5c62cfe9b
--- /dev/null
+++ b/apps/komga/1.18.0/scripts/init.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+  chmod -R 777 "$KOMGA_ROOT_PATH"
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/komga/1.18.0/scripts/uninstall.sh b/apps/komga/1.18.0/scripts/uninstall.sh
new file mode 100644
index 000000000..c86c4fbca
--- /dev/null
+++ b/apps/komga/1.18.0/scripts/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/komga/1.18.0/scripts/upgrade.sh b/apps/komga/1.18.0/scripts/upgrade.sh
new file mode 100644
index 000000000..5c62cfe9b
--- /dev/null
+++ b/apps/komga/1.18.0/scripts/upgrade.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+  chmod -R 777 "$KOMGA_ROOT_PATH"
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/komga/README.md b/apps/komga/README.md
new file mode 100644
index 000000000..aea84dd30
--- /dev/null
+++ b/apps/komga/README.md
@@ -0,0 +1,49 @@
+# Komga
+
+漫画、漫画、蓝光光盘、杂志和电子书的媒体服务器
+
+![Komga](https://file.lifebus.top/imgs/komga_cover.png)
+
+![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue)
+
+## 简介
+
+🚀 浏览桌面、平板和手机上的响应式 Web 界面中的图书馆、系列和书籍
+
+🚀 整理您的图书馆，创建收藏和阅读列表
+
+🚀 编辑您系列和书籍的元数据
+
+🚀 自动导入嵌入式元数据
+
+🚀 多模式阅读器
+
+🚀 管理多个用户，具有每个图书馆的访问控制、年龄限制和标签限制
+
+🚀 提供 REST API，许多社区工具和脚本可以与 Komga 交互
+
+🚀 OPDS v1 和 v2 支持
+
+🚀 将 Kobo 与您的 Kobo 电子书同步
+
+🚀 KOReader 同步
+
+🚀 下载书籍文件，完整系列或阅读列表
+
+🚀 重复文件检测
+
+🚀 重复页面检测与删除
+
+🚀 从您的图书馆外部直接将书籍导入系列文件夹
+
+🚀 导入 ComicRack cbl阅读列表
+
+## 支持的媒体文件类型
+
++ 漫画书存档：CBZ 和 CBR
++ 电子书，格式为EPUB
++ PDF 文件
+
+---
+
+![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png)
diff --git a/apps/komga/data.yml b/apps/komga/data.yml
new file mode 100644
index 000000000..50fa45244
--- /dev/null
+++ b/apps/komga/data.yml
@@ -0,0 +1,14 @@
+additionalProperties:
+  key: komga
+  name: Komga
+  tags:
+    - WebSite
+    - Local
+  shortDescZh: 漫画、漫画、蓝光光盘、杂志和电子书的媒体服务器
+  shortDescEn: A media server for comics, manga, magazines and electronic books
+  type: website
+  crossVersionUpdate: true
+  limit: 0
+  website: https://komga.org/
+  github: https://github.com/gotson/komga/
+  document: https://komga.org/docs/introduction/
diff --git a/apps/komga/logo.png b/apps/komga/logo.png
new file mode 100644
index 000000000..71d3b91bd
Binary files /dev/null and b/apps/komga/logo.png differ