diff --git a/README.md b/README.md
index 6ae418cd..a85a4829 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Tautulli](https://github.com/Tautulli/Tautulli) - A Python based monitoring and tracking tool for Plex Media Server
 - [Teddit](https://codeberg.org/teddit/teddit) - Alternative Reddit front-end focused on privacy https://teddit.net
 - [Transmission](https://github.com/transmission/transmission) - Fast, easy, and free BitTorrent client
+- [Uptime Kuma](https://github.com/louislam/uptime-kuma) - A fancy self-hosted monitoring tool.
 - [Wireguard Easy](https://github.com/WeeJeWel/wg-easy) - WireGuard VPN + Web-based Admin UI
 - [Vaultwarden](https://github.com/dani-garcia/vaultwarden) - Unofficial Bitwarden compatible server
 
diff --git a/apps/uptime-kuma/config.json b/apps/uptime-kuma/config.json
new file mode 100644
index 00000000..1dacc455
--- /dev/null
+++ b/apps/uptime-kuma/config.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "../schema.json",
+  "name": "Uptime Kuma",
+  "available": true,
+  "exposable": true,
+  "port": 8125,
+  "id": "uptime-kuma",
+  "tipi_version": 1,
+  "version": "1",
+  "categories": ["utilities"],
+  "description": "It is a self-hosted monitoring tool like Uptime Robot.",
+  "short_desc": "A fancy self-hosted monitoring tool.",
+  "author": "louislam",
+  "source": "https://github.com/louislam/uptime-kuma",
+  "form_fields": []
+}
diff --git a/apps/uptime-kuma/docker-compose.yml b/apps/uptime-kuma/docker-compose.yml
new file mode 100644
index 00000000..1754e921
--- /dev/null
+++ b/apps/uptime-kuma/docker-compose.yml
@@ -0,0 +1,21 @@
+version: "3.7"
+services:
+  uptime-kuma:
+    image: louislam/uptime-kuma:1
+    container_name: uptime-kuma
+    volumes:
+      - ${APP_DATA_DIR}/data:/app/data
+    dns:
+      - ${DNS_IP}
+    ports:
+      - ${APP_PORT}:3001
+    restart: unless-stopped
+    networks:
+      - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.uptime-kuma.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.uptime-kuma.entrypoints: websecure
+      traefik.http.routers.uptime-kuma.service: uptime-kuma
+      traefik.http.routers.uptime-kuma.tls.certresolver: myresolver
+      traefik.http.services.uptime-kuma.loadbalancer.server.port: 3001
diff --git a/apps/uptime-kuma/metadata/description.md b/apps/uptime-kuma/metadata/description.md
new file mode 100644
index 00000000..6c2a91a8
--- /dev/null
+++ b/apps/uptime-kuma/metadata/description.md
@@ -0,0 +1,33 @@
+# Uptime Kuma
+
+<div align="center" width="100%">
+    <img src="https://github.com/louislam/uptime-kuma/raw/master/public/icon.svg" width="128" alt="" />
+</div>
+
+It is a self-hosted monitoring tool like "Uptime Robot".
+
+<img src="https://uptime.kuma.pet/img/dark.jpg" width="700" alt="" />
+
+## 🥔 Live Demo
+
+Try it!
+
+https://demo.uptime.kuma.pet
+
+It is a temporary live demo, all data will be deleted after 10 minutes. The server is located in Tokyo, so if you live far from there, it may affect your experience. I suggest that you should install and try it out for the best demo experience.
+
+VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much!
+
+## ⭐ Features
+
+* Monitoring uptime for HTTP(s) / TCP / HTTP(s) Keyword / Ping / DNS Record / Push / Steam Game Server / Docker Containers.
+* Fancy, Reactive, Fast UI/UX.
+* Notifications via Telegram, Discord, Gotify, Slack, Pushover, Email (SMTP), and [90+ notification services, click here for the full list](https://github.com/louislam/uptime-kuma/tree/master/src/components/notifications).
+* 20 second intervals.
+* [Multi Languages](https://github.com/louislam/uptime-kuma/tree/master/src/languages)
+* Multiple Status Pages
+* Map Status Page to Domain
+* Ping Chart
+* Certificate Info
+* Proxy Support
+* 2FA available
diff --git a/apps/uptime-kuma/metadata/logo.jpg b/apps/uptime-kuma/metadata/logo.jpg
new file mode 100644
index 00000000..4c208f7b
Binary files /dev/null and b/apps/uptime-kuma/metadata/logo.jpg differ