diff --git a/README.md b/README.md
index 91f89f1d..0f0d5886 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [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
 - [Tube Archivist](https://github.com/tubearchivist/tubearchivist) - Your self-hosted YouTube media server
+- [Umami](https://github.com/umami-software/umami) - Umami is a simple, fast, privacy-focused alternative to Google Analytics.
 - [Uptime Kuma](https://github.com/louislam/uptime-kuma) - A fancy self-hosted monitoring tool
 - [Vaultwarden](https://github.com/dani-garcia/vaultwarden) - Unofficial Bitwarden compatible server
 - [Vikunja](https://kolaente.dev/vikunja/) - The open-source, self-hostable to-do app. Organize everything, on all platforms.
diff --git a/apps/umami/config.json b/apps/umami/config.json
new file mode 100644
index 00000000..180c85f3
--- /dev/null
+++ b/apps/umami/config.json
@@ -0,0 +1,29 @@
+{
+  "$schema": "../schema.json",
+  "name": "Umami",
+  "port": 8147,
+  "available": true,
+  "exposable": true,
+  "id": "umami",
+  "tipi_version": 1,
+  "version": "v1.40.0",
+  "categories": ["utilities"],
+  "description": "Umami is a simple, fast, privacy-focused alternative to Google Analytics.",
+  "short_desc": "Umami is a simple, fast, privacy-focused alternative to Google Analytics.",
+  "author": "https://github.com/umami-software",
+  "source": "https://github.com/umami-software/umami",
+  "form_fields": [
+    {
+      "type": "random",
+      "label": "DB_PASSWORD",
+      "min": 32,
+      "env_variable": "DB_PASSWORD"
+    },
+    {
+      "type": "random",
+      "label": "HASH_SALT",
+      "min": 32,
+      "env_variable": "HASH_SALT"
+    }
+  ]
+}
diff --git a/apps/umami/docker-compose.yml b/apps/umami/docker-compose.yml
new file mode 100644
index 00000000..a95649a1
--- /dev/null
+++ b/apps/umami/docker-compose.yml
@@ -0,0 +1,34 @@
+version: "3"
+
+services:
+  umami:
+    image: ghcr.io/umami-software/umami:postgresql-v1.40.0
+    ports:
+      - "${APP_PORT}:3000"
+    environment:
+      DATABASE_URL: postgresql://umami:${DB_PASSWORD}@db:5432/umami
+      DATABASE_TYPE: postgresql
+      HASH_SALT: ${HASH_SALT}
+    depends_on:
+      - umami-db
+    restart: always
+    networks:
+      - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.umami.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.umami.entrypoints: websecure
+      traefik.http.routers.umami.service: umami
+      traefik.http.routers.umami.tls.certresolver: myresolver
+      traefik.http.services.umami.loadbalancer.server.port: 3000
+  umami-db:
+    image: postgres:12-alpine
+    environment:
+      POSTGRES_DB: umami
+      POSTGRES_USER: umami
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+    volumes:
+      - ${APP_DATA_DIR}/data/postgres:/var/lib/postgresql/data
+    restart: always
+    networks:
+      - tipi_main_network
diff --git a/apps/umami/metadata/description.md b/apps/umami/metadata/description.md
new file mode 100644
index 00000000..62a1ef03
--- /dev/null
+++ b/apps/umami/metadata/description.md
@@ -0,0 +1,11 @@
+# Defualt Login
+### Username: admin
+### Password: umami
+
+# umami
+
+Umami is a simple, fast, privacy-focused alternative to Google Analytics.
+
+## [](https://github.com/umami-software/umami/blob/master/README.md#getting-started)Getting started
+
+A detailed getting started guide can be found at [https://umami.is/docs/](https://umami.is/docs/)
\ No newline at end of file
diff --git a/apps/umami/metadata/logo.jpg b/apps/umami/metadata/logo.jpg
new file mode 100644
index 00000000..6ee5f8ca
Binary files /dev/null and b/apps/umami/metadata/logo.jpg differ