diff --git a/docker-compose.yml b/docker-compose.yml
index 79f5fd3..489a220 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,8 @@
 services:
   umami:
     image: ghcr.io/umami-software/umami:postgresql-latest
-    restart: always
+    container_name: umami
+    restart: unless-stopped
     environment:
       DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
       APP_SECRET: ${APP_SECRET}
@@ -28,7 +29,8 @@ services:
 
   db:
     image: postgres:16-alpine
-    restart: always
+    container_name: umami-db
+    restart: unless-stopped
     environment:
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_USER: ${POSTGRES_USER}