diff --git a/app-list.png b/app-list.png
index 713a1d34..e3d1c4bd 100644
Binary files a/app-list.png and b/app-list.png differ
diff --git a/apps/zabbix-server/6.4.4&mysql/.env.sample b/apps/zabbix-server/6.4.4&mysql/.env.sample
new file mode 100644
index 00000000..6f17280a
--- /dev/null
+++ b/apps/zabbix-server/6.4.4&mysql/.env.sample
@@ -0,0 +1,7 @@
+CONTAINER_NAME="zabbix-server"
+PANEL_APP_PORT_HTTP2="10051"
+PANEL_APP_PORT_HTTP="40047"
+PANEL_DB_NAME="zabbix"
+PANEL_DB_USER="zabbix"
+PANEL_DB_USER_PASSWORD="MyDBPWD_brls9UwcRasl"
+MYSQL_PASSWORD="MySQL_root_pwd"
\ No newline at end of file
diff --git a/apps/zabbix-server/6.4.4&mysql/conf/my.cnf b/apps/zabbix-server/6.4.4&mysql/conf/my.cnf
new file mode 100644
index 00000000..30e94200
--- /dev/null
+++ b/apps/zabbix-server/6.4.4&mysql/conf/my.cnf
@@ -0,0 +1,19 @@
+[mysqld]
+skip-host-cache
+skip-name-resolve
+datadir=/var/lib/mysql
+socket=/var/run/mysqld/mysqld.sock
+secure-file-priv=/var/lib/mysql-files
+user=mysql
+
+
+character_set_server=utf8
+lower_case_table_names=1
+group_concat_max_len=1024000
+log_bin_trust_function_creators=1
+
+pid-file=/var/run/mysqld/mysqld.pid
+[client]
+socket=/var/run/mysqld/mysqld.sock
+
+!includedir /etc/mysql/conf.d/
\ No newline at end of file
diff --git a/apps/zabbix-server/6.4.4&mysql/data.yml b/apps/zabbix-server/6.4.4&mysql/data.yml
new file mode 100644
index 00000000..28bbf1d1
--- /dev/null
+++ b/apps/zabbix-server/6.4.4&mysql/data.yml
@@ -0,0 +1,50 @@
+additionalProperties:
+    formFields:
+        - default: zabbix
+          envKey: MYSQL_PASSWORD
+          labelEn: MySQL root Password
+          labelZh: 数据库root密码
+          random: true
+          required: true
+          rule: paramComplexity
+          type: password
+        - default: zabbix
+          envKey: PANEL_DB_NAME
+          labelEn: Database
+          labelZh: 数据库名
+          random: true
+          required: true
+          rule: paramCommon
+          type: text
+        - default: zabbix
+          envKey: PANEL_DB_USER
+          labelEn: User
+          labelZh: 数据库用户
+          random: true
+          required: true
+          rule: paramCommon
+          type: text
+        - default: zabbix
+          envKey: PANEL_DB_USER_PASSWORD
+          labelEn: Password
+          labelZh: 数据库用户密码
+          random: true
+          required: true
+          rule: paramComplexity
+          type: password
+        - default: 10051
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP2
+          labelEn: Gateway port
+          labelZh: 网关端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 40047
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: Port
+          labelZh: 端口
+          required: true
+          rule: paramPort
+          type: number
diff --git a/apps/zabbix-server/6.4.4&mysql/docker-compose.yml b/apps/zabbix-server/6.4.4&mysql/docker-compose.yml
new file mode 100644
index 00000000..5df4ad5a
--- /dev/null
+++ b/apps/zabbix-server/6.4.4&mysql/docker-compose.yml
@@ -0,0 +1,77 @@
+version: "3"
+services:
+  mysql-server:
+    container_name: ${CONTAINER_NAME}-mysql
+    restart: always
+    networks:
+      - 1panel-network
+    volumes:
+      - ./data/:/var/lib/mysql
+      - ./conf/my.cnf:/etc/my.cnf
+      - ./log:/var/log/mysql
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+      - MYSQL_DATABASE=${PANEL_DB_NAME}
+      - MYSQL_USER=${PANEL_DB_USER}
+      - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
+    command: --character-set-server=utf8 --collation-server=utf8_bin --default-authentication-plugin=mysql_native_password
+    image: mysql:8.0.33
+    labels:
+      createdBy: Apps
+
+  zabbix-server-mysql:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP2}:10051"
+    environment:
+      - DB_SERVER_HOST=mysql-server
+      - DB_SERVER_PORT=3306
+      - MYSQL_DATABASE=${PANEL_DB_NAME}
+      - MYSQL_USER=${PANEL_DB_USER}
+      - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
+      - ZBX_JAVAGATEWAY=zabbix-java-gateway
+    image: zabbix/zabbix-server-mysql:alpine-6.4.4
+    depends_on:
+      - zabbix-java-gateway
+      - mysql-server
+    labels:
+      createdBy: Apps
+
+  zabbix-java-gateway:
+    container_name: ${CONTAINER_NAME}-gateway
+    restart: always
+    networks:
+      - 1panel-network
+    image: zabbix/zabbix-java-gateway:alpine-6.4.4
+    labels:
+      createdBy: Apps
+
+  zabbix-web-nginx-mysql:
+    container_name: ${CONTAINER_NAME}-nginx
+    restart: always
+    networks:
+      - 1panel-network
+    environment:
+      - ZBX_SERVER_HOST=zabbix-server-mysql
+      - DB_SERVER_HOST=mysql-server
+      - MYSQL_DATABASE=${PANEL_DB_NAME}
+      - MYSQL_USER=${PANEL_DB_USER}
+      - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:8080
+    image: zabbix/zabbix-web-nginx-mysql:alpine-6.4.4
+    depends_on:
+      - zabbix-server-mysql
+      - mysql-server
+    labels:
+      createdBy: Apps
+networks:
+  1panel-network:
+    external: true
diff --git a/apps/zabbix-server/6.4.4-mysql/.env.sample b/apps/zabbix-server/6.4.4/.env.sample
similarity index 100%
rename from apps/zabbix-server/6.4.4-mysql/.env.sample
rename to apps/zabbix-server/6.4.4/.env.sample
diff --git a/apps/zabbix-server/6.4.4-mysql/data.yml b/apps/zabbix-server/6.4.4/data.yml
similarity index 100%
rename from apps/zabbix-server/6.4.4-mysql/data.yml
rename to apps/zabbix-server/6.4.4/data.yml
diff --git a/apps/zabbix-server/6.4.4-mysql/docker-compose.yml b/apps/zabbix-server/6.4.4/docker-compose.yml
similarity index 100%
rename from apps/zabbix-server/6.4.4-mysql/docker-compose.yml
rename to apps/zabbix-server/6.4.4/docker-compose.yml
diff --git a/apps/zabbix-server/README.md b/apps/zabbix-server/README.md
index 881ba98b..3a6100a0 100644
--- a/apps/zabbix-server/README.md
+++ b/apps/zabbix-server/README.md
@@ -1,13 +1,22 @@
 # 使用说明
 
-默认账户与密码
+- 默认账户与密码(注意大小写)
 
 ```
-username:admin
+username:Admin
 password:zabbix
 ```
 
-**注意：Zabbix-MySQL版本的，Zabbix 6.X的需求环境MySQL8**
+## 注意事项
+
+**注意：这是Zabbix-MySQL版本的，Zabbix 6.X的需求环境MySQL8**
+
+商店自带的`MySQL 8`的数据库格式设置与`Zabbix`需求有所不同，`zabbix-server-mysql`容器会提示存在错误。
+
+但是实际能够运行。如有错误，期待反馈。
+
+- 带`&mysql`版本，会安装符合`Zabbix`格式要求的数据库版本
+- 不带`&mysql`的版本，默认调用面板安装的数据库
 
 
 # 原始相关
diff --git a/apps/zabbix-server/data.yml.bak b/apps/zabbix-server/data.yml
similarity index 100%
rename from apps/zabbix-server/data.yml.bak
rename to apps/zabbix-server/data.yml
diff --git a/apps/zabbix-server/latest&mysql/.env.sample b/apps/zabbix-server/latest&mysql/.env.sample
new file mode 100644
index 00000000..6f17280a
--- /dev/null
+++ b/apps/zabbix-server/latest&mysql/.env.sample
@@ -0,0 +1,7 @@
+CONTAINER_NAME="zabbix-server"
+PANEL_APP_PORT_HTTP2="10051"
+PANEL_APP_PORT_HTTP="40047"
+PANEL_DB_NAME="zabbix"
+PANEL_DB_USER="zabbix"
+PANEL_DB_USER_PASSWORD="MyDBPWD_brls9UwcRasl"
+MYSQL_PASSWORD="MySQL_root_pwd"
\ No newline at end of file
diff --git a/apps/zabbix-server/latest&mysql/conf/my.cnf b/apps/zabbix-server/latest&mysql/conf/my.cnf
new file mode 100644
index 00000000..30e94200
--- /dev/null
+++ b/apps/zabbix-server/latest&mysql/conf/my.cnf
@@ -0,0 +1,19 @@
+[mysqld]
+skip-host-cache
+skip-name-resolve
+datadir=/var/lib/mysql
+socket=/var/run/mysqld/mysqld.sock
+secure-file-priv=/var/lib/mysql-files
+user=mysql
+
+
+character_set_server=utf8
+lower_case_table_names=1
+group_concat_max_len=1024000
+log_bin_trust_function_creators=1
+
+pid-file=/var/run/mysqld/mysqld.pid
+[client]
+socket=/var/run/mysqld/mysqld.sock
+
+!includedir /etc/mysql/conf.d/
\ No newline at end of file
diff --git a/apps/zabbix-server/latest&mysql/data.yml b/apps/zabbix-server/latest&mysql/data.yml
new file mode 100644
index 00000000..28bbf1d1
--- /dev/null
+++ b/apps/zabbix-server/latest&mysql/data.yml
@@ -0,0 +1,50 @@
+additionalProperties:
+    formFields:
+        - default: zabbix
+          envKey: MYSQL_PASSWORD
+          labelEn: MySQL root Password
+          labelZh: 数据库root密码
+          random: true
+          required: true
+          rule: paramComplexity
+          type: password
+        - default: zabbix
+          envKey: PANEL_DB_NAME
+          labelEn: Database
+          labelZh: 数据库名
+          random: true
+          required: true
+          rule: paramCommon
+          type: text
+        - default: zabbix
+          envKey: PANEL_DB_USER
+          labelEn: User
+          labelZh: 数据库用户
+          random: true
+          required: true
+          rule: paramCommon
+          type: text
+        - default: zabbix
+          envKey: PANEL_DB_USER_PASSWORD
+          labelEn: Password
+          labelZh: 数据库用户密码
+          random: true
+          required: true
+          rule: paramComplexity
+          type: password
+        - default: 10051
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP2
+          labelEn: Gateway port
+          labelZh: 网关端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 40047
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: Port
+          labelZh: 端口
+          required: true
+          rule: paramPort
+          type: number
diff --git a/apps/zabbix-server/latest&mysql/docker-compose.yml b/apps/zabbix-server/latest&mysql/docker-compose.yml
new file mode 100644
index 00000000..44711bac
--- /dev/null
+++ b/apps/zabbix-server/latest&mysql/docker-compose.yml
@@ -0,0 +1,77 @@
+version: "3"
+services:
+  mysql-server:
+    container_name: ${CONTAINER_NAME}-mysql
+    restart: always
+    networks:
+      - 1panel-network
+    volumes:
+      - ./data/:/var/lib/mysql
+      - ./conf/my.cnf:/etc/my.cnf
+      - ./log:/var/log/mysql
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+      - MYSQL_DATABASE=${PANEL_DB_NAME}
+      - MYSQL_USER=${PANEL_DB_USER}
+      - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
+    command: --character-set-server=utf8 --collation-server=utf8_bin --default-authentication-plugin=mysql_native_password
+    image: mysql:8.0.33
+    labels:
+      createdBy: Apps
+
+  zabbix-server-mysql:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP2}:10051"
+    environment:
+      - DB_SERVER_HOST=mysql-server
+      - DB_SERVER_PORT=3306
+      - MYSQL_DATABASE=${PANEL_DB_NAME}
+      - MYSQL_USER=${PANEL_DB_USER}
+      - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
+      - ZBX_JAVAGATEWAY=zabbix-java-gateway
+    image: zabbix/zabbix-server-mysql:alpine-latest
+    depends_on:
+      - zabbix-java-gateway
+      - mysql-server
+    labels:
+      createdBy: Apps
+
+  zabbix-java-gateway:
+    container_name: ${CONTAINER_NAME}-gateway
+    restart: always
+    networks:
+      - 1panel-network
+    image: zabbix/zabbix-java-gateway:alpine-latest
+    labels:
+      createdBy: Apps
+
+  zabbix-web-nginx-mysql:
+    container_name: ${CONTAINER_NAME}-nginx
+    restart: always
+    networks:
+      - 1panel-network
+    environment:
+      - ZBX_SERVER_HOST=zabbix-server-mysql
+      - DB_SERVER_HOST=mysql-server
+      - MYSQL_DATABASE=${PANEL_DB_NAME}
+      - MYSQL_USER=${PANEL_DB_USER}
+      - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:8080
+    image: zabbix/zabbix-web-nginx-mysql:alpine-latest
+    depends_on:
+      - zabbix-server-mysql
+      - mysql-server
+    labels:
+      createdBy: Apps
+networks:
+  1panel-network:
+    external: true
diff --git a/apps/zabbix-server/latest-mysql/.env.sample b/apps/zabbix-server/latest/.env.sample
similarity index 100%
rename from apps/zabbix-server/latest-mysql/.env.sample
rename to apps/zabbix-server/latest/.env.sample
diff --git a/apps/zabbix-server/latest-mysql/data.yml b/apps/zabbix-server/latest/data.yml
similarity index 100%
rename from apps/zabbix-server/latest-mysql/data.yml
rename to apps/zabbix-server/latest/data.yml
diff --git a/apps/zabbix-server/latest-mysql/docker-compose.yml b/apps/zabbix-server/latest/docker-compose.yml
similarity index 100%
rename from apps/zabbix-server/latest-mysql/docker-compose.yml
rename to apps/zabbix-server/latest/docker-compose.yml