diff --git a/kimai/2.23.0/data.yml b/kimai/2.23.0/data.yml
new file mode 100644
index 000000000..1f6b1ab4e
--- /dev/null
+++ b/kimai/2.23.0/data.yml
@@ -0,0 +1,89 @@
+additionalProperties:
+  formFields:
+    - child:
+        default: ""
+        envKey: PANEL_DB_HOST
+        required: true
+        type: service
+      default: mysql
+      edit: true
+      envKey: PANEL_DB_TYPE
+      labelZh: MySQL 服务 (前置检查)
+      labelEn: Database Service (Pre-check)
+      required: true
+      type: apps
+      values:
+        - label: MySQL
+          value: mysql
+        - label: MariaDB
+          value: mariadb
+        - label: Percona
+          value: percona
+    - default: "/home/kimai2"
+      edit: true
+      envKey: KIMAI2_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: 8001
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: 访问端口
+      labelEn: Port
+      required: true
+      rule: paramPort
+      type: number
+    - default: ""
+      edit: true
+      envKey: ADMINMAIL
+      labelZh: 管理员邮箱
+      labelEn: Admin Email
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: ADMINPASS
+      labelZh: 管理员密码
+      labelEn: Admin Password
+      required: true
+      type: password
+    - default: "127.0.0.1"
+      edit: true
+      envKey: DB_HOSTNAME
+      labelZh: 数据库 主机地址
+      labelEn: Database Host
+      required: true
+      type: text
+    - default: 5432
+      edit: true
+      envKey: DB_PORT
+      labelZh: 数据库 端口
+      labelEn: Database Port
+      required: true
+      rule: paramPort
+      type: number
+    - default: "kimai2"
+      edit: true
+      envKey: DB_NAME
+      labelZh: 数据库 名称
+      labelEn: Database Name
+      required: true
+      rule: paramCommon
+      type: text
+    - default: "kimai2"
+      edit: true
+      envKey: DB_USER
+      labelZh: 数据库 用户名
+      labelEn: Database Username
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: DB_USER_PASSWORD
+      labelZh: 数据库 密码
+      labelEn: Database Password
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password
diff --git a/kimai/2.23.0/docker-compose.yml b/kimai/2.23.0/docker-compose.yml
new file mode 100644
index 000000000..e755c9755
--- /dev/null
+++ b/kimai/2.23.0/docker-compose.yml
@@ -0,0 +1,22 @@
+networks:
+  1panel-network:
+    external: true
+
+services:
+  kimai2:
+    image: kimai/kimai2:apache-2.23.0
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:8001
+    volumes:
+      - ${KIMAI2_ROOT_PATH}/data:/opt/kimai/var/data
+      - ${KIMAI2_ROOT_PATH}/plugins:/opt/kimai/var/plugins
+    command:
+      - ADMINMAIL=admin@kimai.local
+      - ADMINPASS=changemeplease
+      - DATABASE_URL=mysql://${DB_USER}:${DB_USER_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_NAME}?charset=utf8mb4
diff --git a/kimai/2.23.0/scripts/init.sh b/kimai/2.23.0/scripts/init.sh
new file mode 100644
index 000000000..c86c4fbca
--- /dev/null
+++ b/kimai/2.23.0/scripts/init.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/kimai/2.23.0/scripts/uninstall.sh b/kimai/2.23.0/scripts/uninstall.sh
new file mode 100644
index 000000000..c86c4fbca
--- /dev/null
+++ b/kimai/2.23.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/kimai/2.23.0/scripts/upgrade.sh b/kimai/2.23.0/scripts/upgrade.sh
new file mode 100644
index 000000000..77b849120
--- /dev/null
+++ b/kimai/2.23.0/scripts/upgrade.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/kimai/README.md b/kimai/README.md
new file mode 100644
index 000000000..e680b11c4
--- /dev/null
+++ b/kimai/README.md
@@ -0,0 +1,22 @@
+# Kimai
+
+Kimai 是一款专业级别的时间跟踪应用，免费且开源
+
+![Halo](https://file.lifebus.top/imgs/kimai_cover.png)
+
+Kimai 是一个基于网络的多用户时间追踪应用。对每个人都很棒：自由职业者、公司、组织 - 每个人都可以追踪时间、生成报告、创建发票并做更多事情。
+
+![](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)
+
+## 简介
+
+Kimai 是一款专业级别的时间跟踪应用，免费且开源。它适用于自由职业者以及拥有数十名或数百名用户的公司。
+
+Kimai 被设计用于跟踪项目时间，并配备了众多高级功能，包括但不限于：
+
+JSON API，开票，数据导出，多定时器和打卡模式，标签，多用户 - 多时区 - 多语言（已有超过 30 种翻译！），通过 SAML/LDAP/数据库进行身份验证，使用
+TOTP 的双因素认证（2FA），可定制的角色和团队权限，响应式设计，用户/客户/项目特定的费率，高级搜索与筛选，金钱和时间预算，高级报告，支持插件等等。
+
+---
+
+![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png)
diff --git a/kimai/data.yml b/kimai/data.yml
new file mode 100644
index 000000000..7155a6bad
--- /dev/null
+++ b/kimai/data.yml
@@ -0,0 +1,15 @@
+additionalProperties:
+  key: kimai
+  name: Kimai
+  tags:
+    - WebSite
+    - Middleware
+    - Local
+  shortDescZh: 基于网络的多用户时间追踪应用
+  shortDescEn: Web-based multi-user time tracking application
+  type: website
+  crossVersionUpdate: true
+  limit: 0
+  website: https://www.kimai.org/
+  github: https://github.com/kimai/kimai/
+  document: https://www.kimai.org/documentation/
diff --git a/kimai/logo.png b/kimai/logo.png
new file mode 100644
index 000000000..1602be03d
Binary files /dev/null and b/kimai/logo.png differ