diff --git a/apps/clickhouse/23.9.1-alpine/data.yml b/apps/clickhouse/23.9.1-alpine/data.yml
new file mode 100644
index 000000000000..ac5bd9c4faf2
--- /dev/null
+++ b/apps/clickhouse/23.9.1-alpine/data.yml
@@ -0,0 +1,16 @@
+additionalProperties:
+    formFields:
+        - default: 19000
+          envKey: PANEL_APP_PORT_TCP
+          labelEn: Port
+          labelZh: TCP 端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 18123
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: Port
+          labelZh: API 端口
+          required: true
+          rule: paramPort
+          type: number
diff --git a/apps/clickhouse/23.9.1-alpine/docker-compose.yml b/apps/clickhouse/23.9.1-alpine/docker-compose.yml
new file mode 100644
index 000000000000..880b5b9accfd
--- /dev/null
+++ b/apps/clickhouse/23.9.1-alpine/docker-compose.yml
@@ -0,0 +1,23 @@
+version: '3'
+services:
+  clickhouse:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:8123"
+      - "${PANEL_APP_PORT_TCP}:9000"
+    volumes:
+      - ./clickhouse:/var/lib/clickhouse/
+      - ./clickhouse-server:/var/log/clickhouse-server/
+    image: clickhouse/clickhouse-server:23.9.1-alpine
+    ulimits:
+      nofile:
+        soft: 262144
+        hard: 262144
+    labels:  
+      createdBy: "Apps"
+networks:  
+  1panel-network:  
+    external: true
diff --git a/apps/clickhouse/README.md b/apps/clickhouse/README.md
new file mode 100644
index 000000000000..f17e0332d45d
--- /dev/null
+++ b/apps/clickhouse/README.md
@@ -0,0 +1,21 @@
+# ClickHouse
+
+ClickHouse 一个用于联机分析(OLAP)的列式数据库管理系统(DBMS)
+
+## 主要功能：
+
+
+- 真正的列式数据库管理系统
+- 数据压缩
+- 数据的磁盘存储
+- 多核心并行处理
+- 多服务器分布式处理
+- 支持SQL
+- 向量引擎
+- 实时的数据更新
+- 索引
+- 适合在线查询
+- 支持近似计算
+- 自适应连接算法
+- 支持数据复制和数据完整性
+- 角色的访问控制
diff --git a/apps/clickhouse/data.yml b/apps/clickhouse/data.yml
new file mode 100644
index 000000000000..43f193fc5811
--- /dev/null
+++ b/apps/clickhouse/data.yml
@@ -0,0 +1,19 @@
+name: ClickHouse
+tags:
+    - 数据库
+title: ClickHouse 一个用于联机分析(OLAP)的列式数据库管理系统(DBMS)
+type: 数据库
+description: ClickHouse 是一个用于联机分析(OLAP)的列式数据库管理系统(DBMS)
+additionalProperties:
+    key: clickhouse
+    name: ClickHouse
+    tags:
+        - Database
+    shortDescZh: ClickHouse 一个用于联机分析(OLAP)的列式数据库管理系统(DBMS)
+    shortDescEn: ClickHouse® is a high-performance, column-oriented SQL database management system (DBMS) for online analytical processing (OLAP).
+    type: runtime
+    crossVersionUpdate: false
+    limit: 0
+    website: https://clickhouse.com/
+    github: https://github.com/ClickHouse/ClickHouse
+    document: https://clickhouse.com/docs/zh
\ No newline at end of file
diff --git a/apps/clickhouse/logo.png b/apps/clickhouse/logo.png
new file mode 100644
index 000000000000..db5c31584cd2
Binary files /dev/null and b/apps/clickhouse/logo.png differ
diff --git a/apps/kafka/3.6.0/data.yml b/apps/kafka/3.6.0/data.yml
new file mode 100644
index 000000000000..f7cab6ea9e3a
--- /dev/null
+++ b/apps/kafka/3.6.0/data.yml
@@ -0,0 +1,10 @@
+additionalProperties:
+    formFields:
+        - default: 9092
+          envKey: KAFKA_PORT
+          labelEn: Port
+          labelZh: TCP 端口
+          required: true
+          rule: paramPort
+          type: number
+
diff --git a/apps/kafka/3.6.0/docker-compose.yml b/apps/kafka/3.6.0/docker-compose.yml
new file mode 100644
index 000000000000..6281e7b22101
--- /dev/null
+++ b/apps/kafka/3.6.0/docker-compose.yml
@@ -0,0 +1,30 @@
+version: '3'
+services:
+  kafka:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    environment:
+      ALLOW_PLAINTEXT_LISTENER: 'yes'
+      KAFKA_CFG_LOG_RETENTION_MS: 60000
+      KAFKA_CFG_MAX_REQUEST_SIZE: 524288000
+      KAFKA_CFG_MESSAGE_MAX_BYTES: 524288000
+      KAFKA_CFG_REPLICA_FETCH_MAX_BYTES: 524288000
+      KAFKA_CFG_FETCH_MESSAGE_MAX_BYTES: 524288000
+      KAFKA_CFG_PARTITION_FETCH_BYTES: 524288000
+      KAFKA_CFG_NODE_ID: 0
+      KAFKA_CFG_PROCESS_ROLES: controller,broker
+      KAFKA_CFG_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
+      KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://${CONTAINER_NAME}:${KAFKA_PORT}
+      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@127.0.0.1:9093
+      KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
+    networks:
+      - 1panel-network
+    ports:
+      - "${KAFKA_PORT}:9092"
+    image: bitnami/kafka:3.6.0
+    labels:
+      createdBy: "Apps"
+networks:  
+  1panel-network:  
+    external: true
diff --git a/apps/kafka/README.md b/apps/kafka/README.md
new file mode 100644
index 000000000000..4e6be6834094
--- /dev/null
+++ b/apps/kafka/README.md
@@ -0,0 +1,9 @@
+# Kafka
+
+Kafka 一个分布式流处理平台
+
+## 主要功能：
+
+- 它能够让应用发布或预订数据或事件流。
+- 它能够以可容错的持久方式准确地存储记录（即，按照记录的出现顺序）。
+- 它能够实时处理记录（一出现便处理）。
diff --git a/apps/kafka/data.yml b/apps/kafka/data.yml
new file mode 100644
index 000000000000..87fe1852852d
--- /dev/null
+++ b/apps/kafka/data.yml
@@ -0,0 +1,19 @@
+name: Kafka
+tags:
+    - 中间件
+title: Kafka 一个分布式流处理平台
+type: 中间件
+description: Kafka 是一个分布式流处理平台
+additionalProperties:
+    key: kafka
+    name: Kafka
+    tags:
+        - Middleware
+    shortDescZh: Apache Kafka 是一种分布式数据存储，经过优化以实时提取和处理流数据。流数据是指由数千个数据源持续生成的数据，通常可同时发送数据记录。流平台需要处理这些持续流入的数据，按照顺序逐步处理。
+    shortDescEn: Apache Kafka is a distributed data store optimized for ingesting and processing streaming data in real-time. Streaming data is data that is continuously generated by thousands of data sources, which typically send the data records in simultaneously. A streaming platform needs to handle this constant influx of data, and process the data sequentially and incrementally.
+    type: tool
+    crossVersionUpdate: false
+    limit: 0
+    website: https://kafka.apache.org/
+    github: https://github.com/apache/kafka
+    document: https://kafka.apache.org/documentation/
\ No newline at end of file
diff --git a/apps/kafka/logo.png b/apps/kafka/logo.png
new file mode 100644
index 000000000000..3576e5c511ea
Binary files /dev/null and b/apps/kafka/logo.png differ