diff --git a/compose.gitea.yaml b/compose.gitea.yaml
index 79fbeb1..371af0f 100644
--- a/compose.gitea.yaml
+++ b/compose.gitea.yaml
@@ -17,7 +17,7 @@ services:
       - GITEA__mailer__USER=${SMTP_USER:?}
       - GITEA__mailer__PASSWD=${SMTP_PASSWORD:?}
       - GITEA__mailer__PROTOCOL=smtp+starttls
-    restart: always
+    restart: unless-stopped
     extra_hosts:
       - "host:${HOST_IP}"
     volumes:
diff --git a/compose.loki.yaml b/compose.loki.yaml
index 6f120bf..c6ba1a2 100644
--- a/compose.loki.yaml
+++ b/compose.loki.yaml
@@ -2,7 +2,7 @@ services:
   loki:
     image: grafana/loki:3.5.3
     container_name: loki
-    restart: always
+    restart: unless-stopped
     user: root
     ports:
       - "3100:3100"
diff --git a/compose.teslamate.yaml b/compose.teslamate.yaml
index 062db20..2c0d536 100644
--- a/compose.teslamate.yaml
+++ b/compose.teslamate.yaml
@@ -2,7 +2,7 @@ services:
   teslamate:
     image: teslamate/teslamate:2.1.0
     container_name: teslamate
-    restart: always
+    restart: unless-stopped
     environment:
       - ENCRYPTION_KEY=${TESLAMATE_ENCRYPTION_KEY}
       - DATABASE_HOST=${TESLAMATE_DATABASE_HOST}
@@ -26,7 +26,7 @@ services:
   teslamate-grafana:
     image: teslamate/grafana:2.1.0
     container_name: teslamate-grafana
-    restart: always
+restart: unless-stopped
     environment:
       - DATABASE_HOST=${TESLAMATE_DATABASE_HOST}
       - DATABASE_PORT=${TESLAMATE_DATABASE_PORT}