diff --git a/apps/kimai/2.23.0/data.yml b/apps/kimai/2.23.0/data.yml
index 8502868b..1f6b1ab4 100644
--- a/apps/kimai/2.23.0/data.yml
+++ b/apps/kimai/2.23.0/data.yml
@@ -1,13 +1,32 @@
 additionalProperties:
   formFields:
-    - default: "/home/pingvin-share"
+    - child:
+        default: ""
+        envKey: PANEL_DB_HOST
+        required: true
+        type: service
+      default: mysql
       edit: true
-      envKey: PINGVIN_SHARE_ROOT_PATH
+      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: 3000
+    - default: 8001
       edit: true
       envKey: PANEL_APP_PORT_HTTP
       labelZh: 访问端口
@@ -15,15 +34,56 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
-    - default: "false"
+    - default: ""
       edit: true
-      envKey: TRUST_PROXY
-      labelZh: 是否信任代理
-      labelEn: Trust proxy
+      envKey: ADMINMAIL
+      labelZh: 管理员邮箱
+      labelEn: Admin Email
       required: true
-      type: select
-      values:
-        - label: 信任代理
-          value: "true"
-        - label: 不信任代理
-          value: "false"
+      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/apps/pingvin-share/1.2.1/data.yml b/apps/pingvin-share/1.2.1/data.yml
index 1f6b1ab4..8502868b 100644
--- a/apps/pingvin-share/1.2.1/data.yml
+++ b/apps/pingvin-share/1.2.1/data.yml
@@ -1,32 +1,13 @@
 additionalProperties:
   formFields:
-    - child:
-        default: ""
-        envKey: PANEL_DB_HOST
-        required: true
-        type: service
-      default: mysql
+    - default: "/home/pingvin-share"
       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
+      envKey: PINGVIN_SHARE_ROOT_PATH
       labelZh: 数据持久化路径
       labelEn: Data persistence path
       required: true
       type: text
-    - default: 8001
+    - default: 3000
       edit: true
       envKey: PANEL_APP_PORT_HTTP
       labelZh: 访问端口
@@ -34,56 +15,15 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
-    - default: ""
+    - default: "false"
       edit: true
-      envKey: ADMINMAIL
-      labelZh: 管理员邮箱
-      labelEn: Admin Email
+      envKey: TRUST_PROXY
+      labelZh: 是否信任代理
+      labelEn: Trust proxy
       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
+      type: select
+      values:
+        - label: 信任代理
+          value: "true"
+        - label: 不信任代理
+          value: "false"