diff --git a/keycloak/docker-compose/keycloak/docker-compose.yaml b/keycloak/docker-compose/keycloak/docker-compose.yaml
index 957f2f4..7489104 100644
--- a/keycloak/docker-compose/keycloak/docker-compose.yaml
+++ b/keycloak/docker-compose/keycloak/docker-compose.yaml
@@ -7,6 +7,7 @@ services:
       - traefik.http.services.keycloak.loadbalancer.server.port=8080
     platform: linux/amd64
     image: quay.io/keycloak/keycloak:24.0.4
+    restart: always
     volumes:
       - ./services/keycloak/themes:/opt/keycloak/themes
     environment:
@@ -37,6 +38,7 @@ services:
   keycloak-db:
     platform: linux/amd64
     image: mariadb:10.11.8
+    restart: always
     networks:
       - traefik_traefik
     environment:
diff --git a/ldap/docker-compose/ldap/docker-compose.yaml b/ldap/docker-compose/ldap/docker-compose.yaml
index eeea087..c1b445c 100644
--- a/ldap/docker-compose/ldap/docker-compose.yaml
+++ b/ldap/docker-compose/ldap/docker-compose.yaml
@@ -6,6 +6,7 @@ services:
       - traefik.http.routers.ldap.tls=true
       - traefik.http.services.ldap.loadbalancer.server.port=8080
     image: osixia/openldap:latest
+    restart: always
     container_name: openldap
     hostname: openldap
     ports:
@@ -33,6 +34,7 @@ services:
 
   phpldapadmin:
     image: osixia/phpldapadmin:latest
+    restart: always
     container_name: phpldapadmin
     hostname: phpldapadmin
     ports:
diff --git a/traefik/docker-compose/traefik/docker-compose.yaml b/traefik/docker-compose/traefik/docker-compose.yaml
index 2f89c26..f3aa6aa 100644
--- a/traefik/docker-compose/traefik/docker-compose.yaml
+++ b/traefik/docker-compose/traefik/docker-compose.yaml
@@ -6,6 +6,7 @@ services:
       - traefik.http.services.reverse-proxy.loadbalancer.server.port=8080
     # The official v3 Traefik docker image
     image: traefik:v3.1
+    restart: always
     # Enables the web UI and tells Traefik to listen to docker
     command:
 #      - --api.insecure=true
diff --git a/xwiki/docker-compose/xwiki/docker-compose.yaml b/xwiki/docker-compose/xwiki/docker-compose.yaml
index 976f638..0978012 100644
--- a/xwiki/docker-compose/xwiki/docker-compose.yaml
+++ b/xwiki/docker-compose/xwiki/docker-compose.yaml
@@ -7,6 +7,7 @@ services:
       - traefik.http.routers.xwiki.tls=true
       - traefik.http.services.xwiki.loadbalancer.server.port=8080
     image: "xwiki:stable-mariadb-tomcat"
+    restart: always
     container_name: xwiki-mariadb-tomcat-web
     depends_on:
       - db
@@ -23,6 +24,7 @@ services:
   db:
     image: "mariadb:11.4"
     container_name: xwiki-mariadb-db
+    restart: always
     volumes:
       - mariadb-data:/var/lib/mysql
       - ./init.sql:/docker-entrypoint-initdb.d/init.sql