diff --git a/apps/registry.json b/apps/registry.json
index f2dfe9c..99b6afc 100644
--- a/apps/registry.json
+++ b/apps/registry.json
@@ -636,5 +636,26 @@
         ],
         "path": "",
         "defaultPassword": ""
+    },
+    {
+        "id": "uptime-kuma",
+        "category": "Networking",
+        "name": "Uptime Kuma",
+        "version": "1.11.1",
+        "tagline": "Self-hosted uptime monitoring tool",
+        "description": "Uptime Kuma is a self-hosted monitoring tool like Uptime Robot.\n\nFeatures:\n\n- Monitoring uptime for HTTP(s) / TCP / HTTP(s) Keyword / Ping / DNS Record / Push / Steam Game Server.\n- Fancy, Reactive, Fast UI/UX.\n- Notifications via Telegram, Discord, Gotify, Slack, Pushover, Email (SMTP), and 70+ notification services.\n- 20 second intervals.\n- Multi Languages\n- Simple Status Page\n- Ping Chart\n- Certificate Info\n",
+        "developer": "Louis Lam",
+        "website": "https://uptime.kuma.pet",
+        "dependencies": [],
+        "repo": "https://github.com/louislam/uptime-kuma",
+        "support": "https://github.com/louislam/uptime-kuma/issues",
+        "port": 8385,
+        "gallery": [
+            "1.jpg",
+            "2.jpg",
+            "3.jpg"
+        ],
+        "path": "",
+        "defaultPassword": ""
     }
 ]
diff --git a/apps/uptime-kuma/data/.gitkeep b/apps/uptime-kuma/data/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/apps/uptime-kuma/docker-compose.yml b/apps/uptime-kuma/docker-compose.yml
new file mode 100644
index 0000000..98f8805
--- /dev/null
+++ b/apps/uptime-kuma/docker-compose.yml
@@ -0,0 +1,14 @@
+version: "3.7"
+
+services:
+  uptime-kuma:
+    image: louislam/uptime-kuma:1.11.1@sha256:9fd26d8adae499533e0079f218b4c9139e89b3a085ec04b246c3fbf7af04aa62
+    restart: on-failure
+    stop_grace_period: 1m
+    ports:
+      - ${APP_UPTIME_KUMA_PORT}:3001
+    volumes:
+      - ${APP_DATA_DIR}/data/uptime-kuma:/app/data
+    networks:
+      default:
+        ipv4_address: $APP_UPTIME_KUMA_IP
\ No newline at end of file
diff --git a/scripts/configure b/scripts/configure
index 6ee5e6e..1d44b9e 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -216,6 +216,8 @@ APP_TALLYCOIN_CONNECT_PORT="8123"
 APP_SYNCTHING_IP="10.21.21.61"
 APP_SYNCTHING_PORT="8384"
 APP_SYNCTHING_SYNC_PORT="22000"
+APP_UPTIME_KUMA_PORT="8385"
+APP_UPTIME_KUMA_IP="10.21.21.62"
 
 # Generate RPC credentials
 if [[ -z ${BITCOIN_RPC_USER+x} ]] || [[ -z ${BITCOIN_RPC_PASS+x} ]] || [[ -z ${BITCOIN_RPC_AUTH+x} ]]; then
@@ -429,6 +431,8 @@ for template in "${NGINX_CONF_FILE}" "${BITCOIN_CONF_FILE}" "${LND_CONF_FILE}" "
   sed -i "s/<app-syncthing-ip>/${APP_SYNCTHING_IP}/g" "${template}"
   sed -i "s/<app-syncthing-port>/${APP_SYNCTHING_PORT}/g" "${template}"
   sed -i "s/<app-syncthing-sync-port>/${APP_SYNCTHING_SYNC_PORT}/g" "${template}"
+  sed -i "s/<app-uptime-kuma-port>/${APP_UPTIME_KUMA_PORT}/g" "${template}"
+  sed -i "s/<app-uptime-kuma-ip>/${APP_UPTIME_KUMA_IP}/g" "${template}"
 done
 
 ##########################################################
diff --git a/templates/.env-sample b/templates/.env-sample
index a5cb2a0..17f918b 100644
--- a/templates/.env-sample
+++ b/templates/.env-sample
@@ -110,3 +110,5 @@ APP_TALLYCOIN_CONNECT_PORT=<app-tallycoin-connect-port>
 APP_SYNCTHING_IP=<app-syncthing-ip>
 APP_SYNCTHING_PORT=<app-syncthing-port>
 APP_SYNCTHING_SYNC_PORT=<app-syncthing-sync-port>
+APP_UPTIME_KUMA_PORT=<app-uptime-kuma-port>
+APP_UPTIME_KUMA_IP=<app-uptime-kuma-ip>
diff --git a/templates/torrc-apps-3-sample b/templates/torrc-apps-3-sample
index ea36a32..889c010 100644
--- a/templates/torrc-apps-3-sample
+++ b/templates/torrc-apps-3-sample
@@ -44,3 +44,7 @@ HiddenServicePort 80 <app-tallycoin-connect-ip>:<app-tallycoin-connect-port>
 # syncthing Hidden Service
 HiddenServiceDir /var/lib/tor/app-syncthing
 HiddenServicePort 80 <app-syncthing-ip>:<app-syncthing-port>
+
+# uptime-kuma Hidden Service
+HiddenServiceDir /var/lib/tor/app-uptime-kuma
+HiddenServicePort 80 <app-uptime-kuma-ip>:3001