diff --git a/apps/zabbix-agent/6.4.4/.env.sample b/apps/zabbix-agent/6.4.4/.env.sample
new file mode 100644
index 00000000..46f37d49
--- /dev/null
+++ b/apps/zabbix-agent/6.4.4/.env.sample
@@ -0,0 +1,5 @@
+CONTAINER_NAME="zabbix-agent"
+PANEL_APP_PORT_HTTP="10050"
+HOSTNAME="127.0.0.1"
+ZABBIX_SERVER="192.168.8.8"
+ZABBIX_SERVER_PORT="10051"
diff --git a/apps/zabbix-agent/6.4.4/data.yml b/apps/zabbix-agent/6.4.4/data.yml
new file mode 100644
index 00000000..6a48d6b7
--- /dev/null
+++ b/apps/zabbix-agent/6.4.4/data.yml
@@ -0,0 +1,32 @@
+additionalProperties:
+    formFields:
+        - default: 10050
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: Port
+          labelZh: 端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 127.0.0.1
+          edit: true
+          envKey: HOSTNAME
+          labelEn: Native host name
+          labelZh: 本机主机名
+          required: true
+          type: text
+        - default: 192.168.8.8
+          edit: true
+          envKey: ZABBIX_SERVER
+          labelEn: Zabbix server
+          labelZh: Zabbix服务端
+          required: true
+          type: text
+        - default: 10051
+          edit: true
+          envKey: ZABBIX_SERVER_PORT
+          labelEn: Zabbix server P-port
+          labelZh: Zabbix服务端端口
+          required: true
+          rule: paramPort
+          type: number
\ No newline at end of file
diff --git a/apps/zabbix-agent/6.4.4/docker-compose.yml b/apps/zabbix-agent/6.4.4/docker-compose.yml
new file mode 100644
index 00000000..ba45c683
--- /dev/null
+++ b/apps/zabbix-agent/6.4.4/docker-compose.yml
@@ -0,0 +1,20 @@
+version: "3"
+services:
+  zabbix-agent:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:10050"
+    environment:
+      - ZBX_HOSTNAME=${HOSTNAME}
+      - ZBX_SERVER_HOST=${ZABBIX_SERVER}
+      - ZBX_SERVER_PORT=${ZABBIX_SERVER_PORT}
+    image: zabbix/zabbix-agent:alpine-6.4.4
+    labels:
+      createdBy: Apps
+
+networks:
+  1panel-network:
+    external: true
diff --git a/apps/zabbix-agent/README.md b/apps/zabbix-agent/README.md
new file mode 100644
index 00000000..2035c7bd
--- /dev/null
+++ b/apps/zabbix-agent/README.md
@@ -0,0 +1,32 @@
+Zabbix is free software, released under the GNU General Public License
+(GPL) version 2.
+
+You can redistribute it and/or modify it under the terms of the GNU GPL
+as published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The formal terms of the GPL can be found at
+http://www.fsf.org/licenses/ .
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+Exception for linking with OpenSSL
+
+In addition, as a special exception, we give permission to link the code
+of Zabbix with the OpenSSL project OpenSSL library (or with modified
+versions of it that use the same license as the OpenSSL library), and
+distribute the linked executables.
+
+Please see https://www.zabbix.com/ for detailed information about Zabbix.
+
+On-line Zabbix documentation is available at
+https://www.zabbix.com/documentation/6.2/manual/ .
+
+Zabbix installation instructions can be found at
+https://www.zabbix.com/documentation/6.2/manual/installation/ .
+
+If you are installing Zabbix from packages the instructions can be found at
+https://www.zabbix.com/documentation/6.2/manual/installation/install_from_packages/ .
\ No newline at end of file
diff --git a/apps/zabbix-agent/data.yml.bak b/apps/zabbix-agent/data.yml.bak
new file mode 100644
index 00000000..1fe4d153
--- /dev/null
+++ b/apps/zabbix-agent/data.yml.bak
@@ -0,0 +1,20 @@
+name: Zabbix-Agent
+tags:
+    - 工具
+title: 实时监控 IT 组件和服务(监控端)
+type: 工具
+description: 实时监控 IT 组件和服务(监控端)
+additionalProperties:
+    key: zabbix-agent
+    name: Zabbix-Agent
+    tags:
+        - Tool
+    shortDescZh: 实时监控 IT 组件和服务(监控端)
+    shortDescEn: Real-time monitoring of IT components and services (Agent)
+    type: tool
+    crossVersionUpdate: true
+    limit: 0
+    recommend: 0
+    website: https://www.zabbix.com/
+    github: https://github.com/zabbix/zabbix
+    document: https://www.zabbix.com/manuals
diff --git a/apps/zabbix-agent/latest/.env.sample b/apps/zabbix-agent/latest/.env.sample
new file mode 100644
index 00000000..46f37d49
--- /dev/null
+++ b/apps/zabbix-agent/latest/.env.sample
@@ -0,0 +1,5 @@
+CONTAINER_NAME="zabbix-agent"
+PANEL_APP_PORT_HTTP="10050"
+HOSTNAME="127.0.0.1"
+ZABBIX_SERVER="192.168.8.8"
+ZABBIX_SERVER_PORT="10051"
diff --git a/apps/zabbix-agent/latest/data.yml b/apps/zabbix-agent/latest/data.yml
new file mode 100644
index 00000000..6a48d6b7
--- /dev/null
+++ b/apps/zabbix-agent/latest/data.yml
@@ -0,0 +1,32 @@
+additionalProperties:
+    formFields:
+        - default: 10050
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: Port
+          labelZh: 端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 127.0.0.1
+          edit: true
+          envKey: HOSTNAME
+          labelEn: Native host name
+          labelZh: 本机主机名
+          required: true
+          type: text
+        - default: 192.168.8.8
+          edit: true
+          envKey: ZABBIX_SERVER
+          labelEn: Zabbix server
+          labelZh: Zabbix服务端
+          required: true
+          type: text
+        - default: 10051
+          edit: true
+          envKey: ZABBIX_SERVER_PORT
+          labelEn: Zabbix server P-port
+          labelZh: Zabbix服务端端口
+          required: true
+          rule: paramPort
+          type: number
\ No newline at end of file
diff --git a/apps/zabbix-agent/latest/docker-compose.yml b/apps/zabbix-agent/latest/docker-compose.yml
new file mode 100644
index 00000000..35b21b1e
--- /dev/null
+++ b/apps/zabbix-agent/latest/docker-compose.yml
@@ -0,0 +1,20 @@
+version: "3"
+services:
+  zabbix-agent:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:10050"
+    environment:
+      - ZBX_HOSTNAME=${HOSTNAME}
+      - ZBX_SERVER_HOST=${ZABBIX_SERVER}
+      - ZBX_SERVER_PORT=${ZABBIX_SERVER_PORT}
+    image: zabbix/zabbix-agent:alpine-latest
+    labels:
+      createdBy: Apps
+
+networks:
+  1panel-network:
+    external: true
diff --git a/apps/zabbix-agent/logo.png b/apps/zabbix-agent/logo.png
new file mode 100644
index 00000000..8cabcacd
Binary files /dev/null and b/apps/zabbix-agent/logo.png differ
diff --git a/apps/zabbix-server/6.4.4/.env.sample b/apps/zabbix-server/6.4.4/.env.sample
index 0e81adb6..7510a11a 100644
--- a/apps/zabbix-server/6.4.4/.env.sample
+++ b/apps/zabbix-server/6.4.4/.env.sample
@@ -1,6 +1,6 @@
 CONTAINER_NAME="zabbix-server"
-PANEL_APP_PORT_HTTP="40047"
-PANEL_APP_PORT_HTTP2="40048"
+PANEL_APP_PORT_HTTP="10051"
+PANEL_APP_PORT_HTTP2="40047"
 PANEL_DB_HOST="127.0.0.1"
 FLARUM_DB_PORT="3306"
 PANEL_DB_NAME="zabbix"
diff --git a/apps/zabbix-server/6.4.4/data.yml b/apps/zabbix-server/6.4.4/data.yml
index 4b945f60..80d631cd 100644
--- a/apps/zabbix-server/6.4.4/data.yml
+++ b/apps/zabbix-server/6.4.4/data.yml
@@ -48,7 +48,7 @@ additionalProperties:
           required: true
           rule: paramComplexity
           type: password
-        - default: 40047
+        - default: 10051
           edit: true
           envKey: PANEL_APP_PORT_HTTP
           labelEn: Gateway port
@@ -56,7 +56,7 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
-        - default: 40048
+        - default: 40047
           edit: true
           envKey: PANEL_APP_PORT_HTTP2
           labelEn: Port