diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml
index 369764b..7a02733 100644
--- a/docker/gitea/docker-compose.yaml
+++ b/docker/gitea/docker-compose.yaml
@@ -13,7 +13,7 @@ services:
       - DB_NAME=gitea
       - DB_USER=gitea
       - DB_PASSWD=${MYSQL_PASS}
-    restart: always
+    restart: unless-stopped
     networks:
       - gitea
       - mariadb
diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml
index 12344cc..5452132 100644
--- a/docker/jellyfin/docker-compose.yaml
+++ b/docker/jellyfin/docker-compose.yaml
@@ -10,7 +10,7 @@ services:
       - "8096:8096"
     networks:
       - proxy
-    restart: always
+    restart: unless-stopped
     volumes:
       - /docker/jellyfin/config:/config
       - /docker/jellyfin/cache:/cache
diff --git a/docker/mariadb/docker-compose.yaml b/docker/mariadb/docker-compose.yaml
index afc637e..e09fa12 100644
--- a/docker/mariadb/docker-compose.yaml
+++ b/docker/mariadb/docker-compose.yaml
@@ -11,7 +11,7 @@ services:
     volumes:
       - /docker/mariadb:/var/lib/mysql
       - /etc/localtime:/etc/localtime:ro
-    restart: always
+    restart: unless-stopped
 
 networks:
   mariadb:
diff --git a/docker/matterbridge/docker-compose.yaml b/docker/matterbridge/docker-compose.yaml
index 13e12bd..35588ef 100644
--- a/docker/matterbridge/docker-compose.yaml
+++ b/docker/matterbridge/docker-compose.yaml
@@ -3,6 +3,6 @@ services:
   matterbridge:
     image: 42wim/matterbridge:stable
     container_name: matterbridge
-    restart: always
+    restart: unless-stopped
     volumes:
       - /docker/matterbridge:/etc/matterbridge
diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml
index 163f08a..aaebe2e 100644
--- a/docker/mumble/docker-compose.yaml
+++ b/docker/mumble/docker-compose.yaml
@@ -11,4 +11,4 @@ services:
     volumes:
       - /docker/mumble:/etc/mumble
       - /etc/localtime:/etc/localtime:ro
-    restart: always
+    restart: unless-stopped
diff --git a/docker/portainer/docker-compose.yaml b/docker/portainer/docker-compose.yaml
index 76ffacc..36bab85 100644
--- a/docker/portainer/docker-compose.yaml
+++ b/docker/portainer/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
     container_name: portainer
     environment:
       - TZ=Europe/Helsinki
-    restart: always
+    restart: unless-stopped
     networks:
       - proxy
     volumes:
diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml
index 0c6edcd..e72db84 100644
--- a/docker/tvheadend/docker-compose.yaml
+++ b/docker/tvheadend/docker-compose.yaml
@@ -17,4 +17,4 @@ services:
     devices:
       - /dev/dri:/dev/dri #hardware acceleration
       - /dev/dvb:/dev/dvb #tuner card
-    restart: always
+    restart: unless-stopped