diff --git a/ops/nixos/lib/coredns/default.nix b/ops/nixos/lib/coredns/default.nix
index 1f603c00cf..08566513db 100644
--- a/ops/nixos/lib/coredns/default.nix
+++ b/ops/nixos/lib/coredns/default.nix
@@ -18,6 +18,7 @@
       53  # DNS
     ];
 
+    systemd.services.coredns.unitConfig.StartLimitIntervalSec = "0";
     services.coredns = {
       enable = true;
       config = let
diff --git a/ops/nixos/swann/default.nix b/ops/nixos/swann/default.nix
index 9b204e93b6..3d6238966c 100644
--- a/ops/nixos/swann/default.nix
+++ b/ops/nixos/swann/default.nix
@@ -1203,10 +1203,18 @@ in {
       virtualHosts."192.168.1.1".root = "/srv/tftp";
     };
 
+    systemd.services.kea-dhcp4-server.serviceConfig = {
+      Restart = "always";
+    };
     services.kea = {
       dhcp4.enable = true;
       dhcp4.settings = {
-        interfaces-config.interfaces = ["br-internal" "vl-eduroam"];
+        interfaces-config = {
+          interfaces = ["br-internal" "vl-eduroam"];
+          service-sockets-require-all = true;
+          service-sockets-max-retries = 20;  # retry up to 20 times
+          service-sockets-retry-wait-time = 5000;  # 5 seconds
+        };
         lease-database = {
           type = "memfile";
           persist = true;
diff --git a/ops/nixos/totoro/adsb.nix b/ops/nixos/totoro/adsb.nix
index 487e8e90cb..4deca9304c 100644
--- a/ops/nixos/totoro/adsb.nix
+++ b/ops/nixos/totoro/adsb.nix
@@ -118,6 +118,9 @@
       Group = "fr24feed-cfg";
       ConfigurationDirectory = "fr24feed";
       ConfigurationDirectoryMode = "0750";
+
+      Restart = "on-failure";
+      RestartMode = "direct";
     };
   };
   systemd.services.fr24feed = {