diff --git a/hosts/ps08rp/gitea/docker-compose.yml b/hosts/ps08rp/gitea/docker-compose.yml
index 6163413c8..e34368664 100644
--- a/hosts/ps08rp/gitea/docker-compose.yml
+++ b/hosts/ps08rp/gitea/docker-compose.yml
@@ -17,6 +17,7 @@ services:
             traefik: null
         ports:
             - 2222:22
+        restart: always
         volumes:
             - gitea_data:/data
             - /etc/timezone:/etc/timezone:ro
@@ -29,6 +30,7 @@ services:
         image: docker.io/postgres:16
         networks:
             traefik: null
+        restart: always
         volumes:
             - postgresql:/var/lib/postgresql/data
 
diff --git a/hosts/ps09rp/gitea/docker-compose.yml b/hosts/ps09rp/gitea/docker-compose.yml
index 9e1a4de3c..569defd1f 100644
--- a/hosts/ps09rp/gitea/docker-compose.yml
+++ b/hosts/ps09rp/gitea/docker-compose.yml
@@ -16,7 +16,8 @@ services:
         networks:
             traefik: null
         ports:
-            - 2222:22            
+            - 2222:22
+        restart: always
         volumes:
             - gitea_data:/data
             - /etc/timezone:/etc/timezone:ro
@@ -29,6 +30,7 @@ services:
         image: docker.io/postgres:16
         networks:
             traefik: null
+        restart: always
         volumes:
             - postgresql:/var/lib/postgresql/data
 
diff --git a/hosts/ps09rp/technitium/docker-compose.yaml b/hosts/ps09rp/technitium/docker-compose.yaml
index 15ec02d77..231401c37 100644
--- a/hosts/ps09rp/technitium/docker-compose.yaml
+++ b/hosts/ps09rp/technitium/docker-compose.yaml
@@ -34,4 +34,4 @@ volumes:
         driver_opts:
             type: none
             o: bind
-            device: /opt/containers/technitium/config
\ No newline at end of file
+            device: /opt/containers/technitium/config
diff --git a/hosts/ps10rp/cloudflare-ddns/docker-compose.yml b/hosts/ps10rp/cloudflare-ddns/docker-compose.yml
index 42772bf05..413ba67b5 100644
--- a/hosts/ps10rp/cloudflare-ddns/docker-compose.yml
+++ b/hosts/ps10rp/cloudflare-ddns/docker-compose.yml
@@ -4,3 +4,4 @@ services:
         env_file:
             - .env
         image: docker.io/oznu/cloudflare-ddns:latest
+        restart: always
diff --git a/hosts/ps10rp/gitea/docker-compose.yml b/hosts/ps10rp/gitea/docker-compose.yml
index c5b723bc5..0eea51128 100644
--- a/hosts/ps10rp/gitea/docker-compose.yml
+++ b/hosts/ps10rp/gitea/docker-compose.yml
@@ -17,6 +17,7 @@ services:
             traefik: null
         ports:
             - 2222:22
+        restart: always            
         volumes:
             - gitea_data:/data
             - /etc/timezone:/etc/timezone:ro
@@ -29,6 +30,7 @@ services:
         image: docker.io/postgres:16
         networks:
             traefik: null
+        restart: always            
         volumes:
             - postgresql:/var/lib/postgresql/data
 
diff --git a/hosts/ps10rp/homepage/docker-compose.yml b/hosts/ps10rp/homepage/docker-compose.yml
index 9b1357db5..45342338c 100644
--- a/hosts/ps10rp/homepage/docker-compose.yml
+++ b/hosts/ps10rp/homepage/docker-compose.yml
@@ -11,6 +11,7 @@ services:
             traefik.http.services.homepage.loadbalancer.server.port: 3000
         networks:
             traefik: null
+        restart: always
         volumes:
             - config:/app/config
             - images:/app/public/images
@@ -25,6 +26,7 @@ services:
         networks:
             traefik: null
         privileged: true
+        restart: always
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock:ro
 
diff --git a/hosts/ps10rp/pihole/docker-compose.yml b/hosts/ps10rp/pihole/docker-compose.yml
index 6e828b023..59e0e1020 100644
--- a/hosts/ps10rp/pihole/docker-compose.yml
+++ b/hosts/ps10rp/pihole/docker-compose.yml
@@ -18,6 +18,7 @@ services:
             - 53:53/udp
             - 8080:8080
         privileged: true
+        restart: always
         volumes:
             - config:/etc/pihole
             - dnsmasq:/etc/dnsmasq.d
@@ -32,6 +33,7 @@ services:
         image: docker.io/ekofr/pihole-exporter:latest
         networks:
             traefik: null
+        restart: always
 
 networks:
     traefik:
diff --git a/hosts/ps10rp/portainer-agent/docker-compose.yml b/hosts/ps10rp/portainer-agent/docker-compose.yml
index 098e357ee..ffbe04c17 100644
--- a/hosts/ps10rp/portainer-agent/docker-compose.yml
+++ b/hosts/ps10rp/portainer-agent/docker-compose.yml
@@ -5,6 +5,7 @@ services:
         ports:
             - 9001:9001
         privileged: true
+        restart: always
         volumes:
             - /var/lib/docker/volumes:/var/lib/docker/volumes
             - /var/run/docker.sock:/var/run/docker.sock
diff --git a/hosts/ps10rp/tailscale/docker-compose.yml b/hosts/ps10rp/tailscale/docker-compose.yml
index 0d4869e19..951f11abb 100644
--- a/hosts/ps10rp/tailscale/docker-compose.yml
+++ b/hosts/ps10rp/tailscale/docker-compose.yml
@@ -10,6 +10,7 @@ services:
         image: docker.io/tailscale/tailscale:stable
         network_mode: host
         privileged: true
+        restart: always
         volumes:
             - tailscale:/var/lib/tailscale
             - /dev/net/tun:/dev/net/tun
diff --git a/hosts/ps10rp/traefik/docker-compose.yaml b/hosts/ps10rp/traefik/docker-compose.yaml
index e82661f1f..6887549dc 100644
--- a/hosts/ps10rp/traefik/docker-compose.yaml
+++ b/hosts/ps10rp/traefik/docker-compose.yaml
@@ -19,6 +19,7 @@ services:
             - 80:80
             - 443:443
         privileged: true
+        restart: always        
         volumes:
             - config:/etc/traefik
             - log:/log
diff --git a/hosts/ps10rp/watchtower/docker-compose.yml b/hosts/ps10rp/watchtower/docker-compose.yml
index 772d3a4ca..801ca4d2b 100644
--- a/hosts/ps10rp/watchtower/docker-compose.yml
+++ b/hosts/ps10rp/watchtower/docker-compose.yml
@@ -5,5 +5,6 @@ services:
             - .env
         image: docker.io/containrrr/watchtower:latest
         privileged: true
+        restart: always        
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock