diff --git a/commento/docker-compose.yml b/commento/docker-compose.yml
index 998e2b4..95ac811 100644
--- a/commento/docker-compose.yml
+++ b/commento/docker-compose.yml
@@ -5,8 +5,8 @@ services:
         image: caroga/commentoplusplus
         restart: unless-stopped
         environment:
-            COMMENTO_ORIGIN: https://stats.karaolidis.com/comments/
-            COMMENTO_CDN_PREFIX: https://stats.karaolidis.com/comments/
+            COMMENTO_ORIGIN: https://blog.karaolidis.com/comments/
+            COMMENTO_CDN_PREFIX: https://blog.karaolidis.com/comments/
             COMMENTO_PORT: 8080
             COMMENTO_POSTGRES: postgres://postgres:postgres@db:5432/commento?sslmode=disable
             COMMENTO_SMTP_HOST: ${SMTP_HOST}
diff --git a/umami/docker-compose.yml b/umami/docker-compose.yml
index 5bad0c8..38e9a7f 100644
--- a/umami/docker-compose.yml
+++ b/umami/docker-compose.yml
@@ -2,13 +2,16 @@ version: '3.9'
 
 services:
     umami:
-        image: ghcr.io/mikecao/umami:postgresql-latest
+        image: ghcr.io/umami-software/umami:postgresql-latest
+        build:
+            context: https://github.com/umami-software/umami.git
+            args:
+                DATABASE_TYPE: postgresql
+                BASE_PATH: /stats
         restart: unless-stopped
         environment:
             DATABASE_URL: postgresql://umami:umami@db:5432/umami
             DATABASE_TYPE: postgresql
-            HASH_SALT: ${SALT}
-            TRACKER_SCRIPT_NAME: u
         depends_on:
             - db
         networks: