diff --git a/composes/hasura/hasura.yml b/composes/hasura/hasura.yml
index 5578a96..fc4b28f 100644
--- a/composes/hasura/hasura.yml
+++ b/composes/hasura/hasura.yml
@@ -22,3 +22,4 @@ services:
       - HASURA_GRAPHQL_EXPERIMENTAL_FEATURES=apollo_federation
 
       - N8N_DATABASE_URL=postgres://${POSTGRES_NON_ROOT_USER:-$ADMIN_USER}:${POSTGRES_NON_ROOT_PASSWORD:-$POSTGRES_PASSWORD}@postgres:5432/${N8N_DB:-n8n}
+      - UMAMI_DATABASE_URL=postgres://${POSTGRES_NON_ROOT_USER:-$ADMIN_USER}:${POSTGRES_NON_ROOT_PASSWORD:-$POSTGRES_PASSWORD}@postgres:5432/${UMAMI_DB:-umami}
diff --git a/composes/postgres/init-data.sh b/composes/postgres/init-data.sh
index e2e8257..9e4af07 100644
--- a/composes/postgres/init-data.sh
+++ b/composes/postgres/init-data.sh
@@ -26,4 +26,14 @@ if [ -n "${N8N_DB:-n8n}" ] && [ -n "${POSTGRES_NON_ROOT_USER:-}" ] && [ -n "${PO
 	EOSQL
 else
 	echo "SETUP INFO: No N8N_DB given!"
+fi
+
+# Create umami table
+if [ -n "${UMAMI_DB:-umami}" ] && [ -n "${POSTGRES_NON_ROOT_USER:-}" ] && [ -n "${POSTGRES_NON_ROOT_PASSWORD:-}" ]; then
+	psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB" <<-EOSQL
+		CREATE DATABASE ${UMAMI_DB:-umami};
+		GRANT ALL PRIVILEGES ON DATABASE ${UMAMI_DB:-umami} TO $POSTGRES_NON_ROOT_USER;
+	EOSQL
+else
+	echo "SETUP INFO: No UMAMI_DB given!"
 fi
\ No newline at end of file
diff --git a/composes/umami/umami.yml b/composes/umami/umami.yml
new file mode 100644
index 0000000..972c677
--- /dev/null
+++ b/composes/umami/umami.yml
@@ -0,0 +1,13 @@
+services:
+  umami:
+    image: ghcr.io/umami-software/umami:postgresql-latest
+    ports:
+      - 3000:3000
+    environment:
+      DATABASE_URL: postgres://${POSTGRES_NON_ROOT_USER:-$ADMIN_USER}:${POSTGRES_NON_ROOT_PASSWORD:-$POSTGRES_PASSWORD}@postgres:5432/${UMAMI_DB:-umami}
+      DATABASE_TYPE: postgresql
+      HASH_SALT: replace-me-with-a-random-string
+    depends_on:
+      postgres:
+        condition: service_healthy
+    restart: always
diff --git a/docker-compose.yml b/docker-compose.yml
index dbc6e4c..dcbda27 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,6 +32,11 @@ services:
       file: composes/n8n/n8n.yml
       service: n8n-worker
 
+  umami:
+    extends:
+      file: composes/umami/umami.yml
+      service: umami
+
 volumes:
   postgres_storage:
   redis_storage: