diff --git a/container/adsb/default.nix b/container/adsb/default.nix
index 6364328..c0686e0 100644
--- a/container/adsb/default.nix
+++ b/container/adsb/default.nix
@@ -10,7 +10,7 @@ in
           image = "ghcr.io/sdr-enthusiasts/docker-readsb-protobuf:latest";
           container_name = "readsb";
           hostname = "readsb";
-          restart = "always";
+          restart = "unless-stopped";
           environment = {
             "TZ" = "Europe/Berlin";
             "DISABLE_PERFORMANCE_GRAPHS" = "true";
@@ -36,7 +36,7 @@ in
           image = "ghcr.io/sdr-enthusiasts/docker-readsb-protobuf:latest";
           container_name = "mlathub";
           hostname = "mlathub";
-          restart = "always";
+          restart = "unless-stopped";
           depends_on = [ "readsb" "piaware" "adsbexchange" ];
           environment = {
             "TZ" = "Europe/Berlin";
@@ -55,7 +55,7 @@ in
         service = {
           image = "ghcr.io/sdr-enthusiasts/docker-tar1090:latest";
           container_name = "tar1090";
-          restart = "always";
+          restart = "unless-stopped";
           depends_on = [ "readsb" "mlathub" ];
           ports = [ "8081:80" ];
           environment = {
@@ -84,7 +84,7 @@ in
         service = {
           image = "ghcr.io/sdr-enthusiasts/docker-adsbexchange:latest";
           container_name = "adsbexchange";
-          restart = "always";
+          restart = "unless-stopped";
           depends_on = [ "readsb" ];
           environment = {
             "TZ" = "Europe/Berlin";
@@ -107,7 +107,7 @@ in
         service = {
           image = "ghcr.io/sdr-enthusiasts/docker-flightradar24:latest";
           container_name = "fr24feed";
-          restart = "always";
+          restart = "unless-stopped";
           depends_on = [ "readsb" ];
           environment = {
             "TZ" = "Europe/Berlin";
@@ -123,7 +123,7 @@ in
         service = {
           image = "ghcr.io/sdr-enthusiasts/docker-piaware:latest";
           container_name = "piaware";
-          restart = "always";
+          restart = "unless-stopped";
           depends_on = [ "readsb" ];
           environment = {
             "TZ" = "Europe/Berlin";
diff --git a/container/webserver/default.nix b/container/webserver/default.nix
index 228a818..8717ea0 100644
--- a/container/webserver/default.nix
+++ b/container/webserver/default.nix
@@ -9,7 +9,7 @@ in
         service = {
           image = "robbertkl/ipv6nat:latest";
           container_name = "ipv6nat";
-          restart = "always";
+          restart = "unless-stopped";
           capabilities = {
             ALL = false;
             NET_ADMIN = true;
@@ -26,7 +26,7 @@ in
         service = {
           image = "eclipse-mosquitto:2";
           container_name = "mosquitto";
-          restart = "always";
+          restart = "unless-stopped";
           depends_on = [ "ipv6nat" ];
           networks = [ "webserver" ];
           ports = [ "1883:1883" ];
@@ -41,7 +41,7 @@ in
         service = {
           image = "traefik:v2.8";
           container_name = "traefik";
-          restart = "always";
+          restart = "unless-stopped";
           depends_on = [ "ipv6nat" ];
           networks = [ "webserver" ];
           ports = [
@@ -63,7 +63,7 @@ in
       ifconfig-sexy = {
         service = {
           image = "ghcr.io/nifoc/ifconfig.sexy-caddy:master";
-          restart = "always";
+          restart = "unless-stopped";
           depends_on = [ "ipv6nat" ];
           networks = [ "webserver" ];
           labels = {
@@ -83,7 +83,7 @@ in
       nifoc-pw-docs = {
         service = {
           image = "ghcr.io/nifoc/nifoc.pw-docs:master";
-          restart = "always";
+          restart = "unless-stopped";
           depends_on = [ "ipv6nat" ];
           networks = [ "webserver" ];
           labels = {
@@ -102,7 +102,7 @@ in
       weewx = {
         service = {
           image = "ghcr.io/nifoc/weewx-docker:master";
-          restart = "always";
+          restart = "unless-stopped";
           depends_on = [ "ipv6nat" "mosquitto" ];
           networks = [ "webserver" ];
           environment = {