diff --git a/apps/pterodactyl-china/1.13.0.0/.env.sample b/apps/pterodactyl-china/1.13.0.0/.env.sample
index c1f7072e9..44d28bd85 100644
--- a/apps/pterodactyl-china/1.13.0.0/.env.sample
+++ b/apps/pterodactyl-china/1.13.0.0/.env.sample
@@ -9,6 +9,7 @@ MAIL_FROM="noreply@example.com"
 MAIL_HOST="mail"
 MAIL_PORT="1025"
 MAIL_USERNAME=""
+MAIL_PASSWORD=""
 PANEL_APP_PORT_HTTP="40222"
 PANEL_APP_URL="http://localhost:40222"
 PANEL_DB_HOST="mysql"
diff --git a/apps/pterodactyl-china/1.13.0.0/data.yml b/apps/pterodactyl-china/1.13.0.0/data.yml
index 1189eba36..73ee8dc67 100644
--- a/apps/pterodactyl-china/1.13.0.0/data.yml
+++ b/apps/pterodactyl-china/1.13.0.0/data.yml
@@ -53,6 +53,25 @@ additionalProperties:
       values:
         - label: "MySQL"
           value: mysql
+        - label: "MariaDB"
+          value: mariadb
+    - default: 3306
+      edit: true
+      envKey: PANEL_DB_PORT
+      labelEn: Database Port
+      labelZh: 数据库端口
+      label:
+        en: 'Database Port'
+        zh: '数据库端口'
+        zh-Hant: '資料庫連接埠'
+        ja: 'データベースポート'
+        ko: '데이터베이스 포트'
+        ru: 'Порт базы данных'
+        ms: 'Port pangkalan data'
+        pt-br: 'Porta do banco de dados'
+      required: true
+      rule: paramPort
+      type: number
     - default: pterodactyl
       envKey: PANEL_DB_NAME
       labelEn: Database
@@ -302,6 +321,22 @@ additionalProperties:
         pt-br: 'Nome de usuário do e-mail'
       required: false
       type: text
+    - default: ''
+      edit: true
+      envKey: MAIL_PASSWORD
+      labelEn: Mail Password
+      labelZh: 邮件密码
+      label:
+        en: 'Mail Password'
+        zh: '邮件密码'
+        zh-Hant: '郵件密碼'
+        ja: 'メールパスワード'
+        ko: '메일 비밀번호'
+        ru: 'Пароль почты'
+        ms: 'Kata laluan e-mel'
+        pt-br: 'Senha do e-mail'
+      required: false
+      type: password
     - default: "true"
       edit: true
       envKey: MAIL_ENCRYPTION
diff --git a/apps/pterodactyl-china/1.13.0.0/docker-compose.yml b/apps/pterodactyl-china/1.13.0.0/docker-compose.yml
index c3f714ca2..59988bb68 100644
--- a/apps/pterodactyl-china/1.13.0.0/docker-compose.yml
+++ b/apps/pterodactyl-china/1.13.0.0/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     environment:
       - USER_UID=${USER_UID}
       - USER_GID=${USER_GID}
-      - DB_CONNECTION=${PANEL_DB_TYPE}
+      - DB_CONNECTION=mysql
       - DB_HOST=${PANEL_DB_HOST}
       - DB_PORT=${PANEL_DB_PORT}
       - DB_DATABASE=${PANEL_DB_NAME}
@@ -35,7 +35,7 @@ services:
       - QUEUE_DRIVER=${QUEUE_DRIVER}
       - REDIS_HOST=${REDIS_HOST}
       - REDIS_PASSWORD=${PANEL_REDIS_ROOT_PASSWORD}
-      - RECAPTCHA_ENABLED=${RECAPTCHA_ENABLED}
+      - RECAPTCHA_ENABLED=${PANEL_RECAPTCHA_ENABLED}
     restart: always
     networks:
       - 1panel-network
diff --git a/apps/pterodactyl-china/latest/.env.sample b/apps/pterodactyl-china/latest/.env.sample
index c1f7072e9..44d28bd85 100644
--- a/apps/pterodactyl-china/latest/.env.sample
+++ b/apps/pterodactyl-china/latest/.env.sample
@@ -9,6 +9,7 @@ MAIL_FROM="noreply@example.com"
 MAIL_HOST="mail"
 MAIL_PORT="1025"
 MAIL_USERNAME=""
+MAIL_PASSWORD=""
 PANEL_APP_PORT_HTTP="40222"
 PANEL_APP_URL="http://localhost:40222"
 PANEL_DB_HOST="mysql"
diff --git a/apps/pterodactyl-china/latest/data.yml b/apps/pterodactyl-china/latest/data.yml
index 464992cf8..4c13d1d79 100644
--- a/apps/pterodactyl-china/latest/data.yml
+++ b/apps/pterodactyl-china/latest/data.yml
@@ -53,6 +53,25 @@ additionalProperties:
       values:
         - label: "MySQL"
           value: mysql
+        - label: "MariaDB"
+          value: mariadb
+    - default: 3306
+      edit: true
+      envKey: PANEL_DB_PORT
+      labelEn: Database Port
+      labelZh: 数据库端口
+      label:
+        en: 'Database Port'
+        zh: '数据库端口'
+        zh-Hant: '資料庫連接埠'
+        ja: 'データベースポート'
+        ko: '데이터베이스 포트'
+        ru: 'Порт базы данных'
+        ms: 'Port pangkalan data'
+        pt-br: 'Porta do banco de dados'
+      required: true
+      rule: paramPort
+      type: number
     - default: pterodactyl
       envKey: PANEL_DB_NAME
       labelEn: Database
@@ -302,6 +321,22 @@ additionalProperties:
         pt-br: 'Nome de usuário do e-mail'
       required: false
       type: text
+    - default: ''
+      edit: true
+      envKey: MAIL_PASSWORD
+      labelEn: Mail Password
+      labelZh: 邮件密码
+      label:
+        en: 'Mail Password'
+        zh: '邮件密码'
+        zh-Hant: '郵件密碼'
+        ja: 'メールパスワード'
+        ko: '메일 비밀번호'
+        ru: 'Пароль почты'
+        ms: 'Kata laluan e-mel'
+        pt-br: 'Senha do e-mail'
+      required: false
+      type: password
     - default: "true"
       edit: true
       envKey: MAIL_ENCRYPTION
diff --git a/apps/pterodactyl-china/latest/docker-compose.yml b/apps/pterodactyl-china/latest/docker-compose.yml
index c15ad4797..c4a7e3c2b 100644
--- a/apps/pterodactyl-china/latest/docker-compose.yml
+++ b/apps/pterodactyl-china/latest/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     environment:
       - USER_UID=${USER_UID}
       - USER_GID=${USER_GID}
-      - DB_CONNECTION=${PANEL_DB_TYPE}
+      - DB_CONNECTION=mysql
       - DB_HOST=${PANEL_DB_HOST}
       - DB_PORT=${PANEL_DB_PORT}
       - DB_DATABASE=${PANEL_DB_NAME}
@@ -35,7 +35,7 @@ services:
       - QUEUE_DRIVER=${QUEUE_DRIVER}
       - REDIS_HOST=${REDIS_HOST}
       - REDIS_PASSWORD=${PANEL_REDIS_ROOT_PASSWORD}
-      - RECAPTCHA_ENABLED=${RECAPTCHA_ENABLED}
+      - RECAPTCHA_ENABLED=${PANEL_RECAPTCHA_ENABLED}
     restart: always
     networks:
       - 1panel-network