diff --git a/.github/renovate.json b/.github/renovate.json
index 11ecb4b62..2de8edba3 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -159,6 +159,18 @@
         "apps/jellyfin/10.10.*/*.yml"
       ],
       "allowedVersions": ">=10.10"
+    },
+    {
+      "matchFileNames": [
+        "apps/uptime-kuma/1.*/*.yml"
+      ],
+      "allowedVersions": "<2.0"
+    },
+    {
+      "matchFileNames": [
+        "apps/uptime-kuma/2.*/*.yml"
+      ],
+      "allowedVersions": ">=2.0"
     }
   ],
   "prCreation": "immediate"
diff --git a/apps/uptime-kuma/2.0.0/data.yml b/apps/uptime-kuma/2.0.0/data.yml
new file mode 100644
index 000000000..a1f697d37
--- /dev/null
+++ b/apps/uptime-kuma/2.0.0/data.yml
@@ -0,0 +1,17 @@
+additionalProperties:
+  formFields:
+    - default: "/home/uptime-kuma"
+      edit: true
+      envKey: UPTIME_KUMA_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: 3001
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: WebUI 端口
+      labelEn: WebUI port
+      required: true
+      rule: paramPort
+      type: number
diff --git a/apps/uptime-kuma/2.0.0/docker-compose.yml b/apps/uptime-kuma/2.0.0/docker-compose.yml
new file mode 100644
index 000000000..69f98a655
--- /dev/null
+++ b/apps/uptime-kuma/2.0.0/docker-compose.yml
@@ -0,0 +1,22 @@
+networks:
+  1panel-network:
+    external: true
+
+services:
+  uptime-kuma:
+    image: louislam/uptime-kuma:2.0.0-beta.0
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:3001
+    env_file:
+      - /etc/1panel/envs/global.env
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
+    volumes:
+      - ${UPTIME_KUMA_ROOT_PATH}/data:/app/data
+      - ${UPTIME_KUMA_ROOT_PATH}/server:/app/server
+      - ${UPTIME_KUMA_ROOT_PATH}/db:/app/db
diff --git a/apps/uptime-kuma/2.0.0/scripts/init.sh b/apps/uptime-kuma/2.0.0/scripts/init.sh
new file mode 100644
index 000000000..77b849120
--- /dev/null
+++ b/apps/uptime-kuma/2.0.0/scripts/init.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/uptime-kuma/2.0.0/scripts/uninstall.sh b/apps/uptime-kuma/2.0.0/scripts/uninstall.sh
new file mode 100644
index 000000000..c86c4fbca
--- /dev/null
+++ b/apps/uptime-kuma/2.0.0/scripts/uninstall.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi
diff --git a/apps/uptime-kuma/2.0.0/scripts/upgrade.sh b/apps/uptime-kuma/2.0.0/scripts/upgrade.sh
new file mode 100644
index 000000000..77b849120
--- /dev/null
+++ b/apps/uptime-kuma/2.0.0/scripts/upgrade.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi