diff --git a/container/matrix/default.nix b/container/matrix/default.nix
index b2ee7b0..d818861 100644
--- a/container/matrix/default.nix
+++ b/container/matrix/default.nix
@@ -32,18 +32,6 @@
     };
   };
 
-  systemd.services.podman-signald.serviceConfig = {
-    TimeoutStopSec = lib.mkForce 5;
-  };
-
-  systemd.services.podman-matrix-signal.serviceConfig = {
-    TimeoutStopSec = lib.mkForce 5;
-  };
-
-  systemd.services.podman-matrix-whatsapp.serviceConfig = {
-    TimeoutStopSec = lib.mkForce 5;
-  };
-
   networking.firewall.interfaces."podman+" = {
     allowedUDPPorts = [ 443 ];
     allowedTCPPorts = [ 443 ];
diff --git a/container/proxitok/default.nix b/container/proxitok/default.nix
index ce08e45..43f8dbd 100644
--- a/container/proxitok/default.nix
+++ b/container/proxitok/default.nix
@@ -25,14 +25,6 @@
     };
   };
 
-  systemd.services.podman-proxitok-web.serviceConfig = {
-    TimeoutStopSec = lib.mkForce 5;
-  };
-
-  systemd.services.podman-proxitok-signer.serviceConfig = {
-    TimeoutStopSec = lib.mkForce 5;
-  };
-
   systemd.tmpfiles.rules = [
     "d /etc/container-proxitok/cache 0755 33 33"
   ];
diff --git a/container/tubearchivist/default.nix b/container/tubearchivist/default.nix
index cfed071..0e2cb43 100644
--- a/container/tubearchivist/default.nix
+++ b/container/tubearchivist/default.nix
@@ -43,20 +43,8 @@
     {
       requires = lib.mkAfter mounts;
       after = lib.mkAfter mounts;
-
-      serviceConfig = {
-        TimeoutStopSec = lib.mkForce 30;
-      };
     };
 
-  systemd.services.podman-archivist-redis.serviceConfig = {
-    TimeoutStopSec = lib.mkForce 30;
-  };
-
-  systemd.services.podman-archivist-es.serviceConfig = {
-    TimeoutStopSec = lib.mkForce 30;
-  };
-
   services.nginx.virtualHosts."tubearchivist.internal.kempkens.network" = {
     quic = true;
     http3 = true;
diff --git a/container/weewx/default.nix b/container/weewx/default.nix
index b5d798b..2309d33 100644
--- a/container/weewx/default.nix
+++ b/container/weewx/default.nix
@@ -20,10 +20,6 @@ in
     ];
   };
 
-  systemd.services.podman-weewx.serviceConfig = {
-    TimeoutStopSec = lib.mkForce 5;
-  };
-
   systemd.tmpfiles.rules = [
     "d ${data-dir} 0755 421 421"
     "d ${data-dir}/html 0755 421 421"
diff --git a/secret/container/additional-media/default.nix b/secret/container/additional-media/default.nix
index 0bee00c..699e823 100644
Binary files a/secret/container/additional-media/default.nix and b/secret/container/additional-media/default.nix differ
diff --git a/system/nixos/autobrr.nix b/system/nixos/autobrr.nix
index fe8a20d..dc649eb 100644
--- a/system/nixos/autobrr.nix
+++ b/system/nixos/autobrr.nix
@@ -45,10 +45,6 @@
       requires = lib.mkAfter depends;
       bindsTo = [ "wg.service" ];
       after = lib.mkForce ([ "wg.service" ] ++ depends);
-
-      serviceConfig = {
-        TimeoutStopSec = lib.mkForce 10;
-      };
     };
 
   systemd.services.podman-omegabrr =
@@ -59,10 +55,6 @@
       requires = lib.mkAfter depends;
       bindsTo = [ "wg.service" ];
       after = lib.mkForce ([ "wg.service" ] ++ depends);
-
-      serviceConfig = {
-        TimeoutStopSec = lib.mkForce 10;
-      };
     };
 
   services.nginx.virtualHosts."autobrr.internal.kempkens.network" = {
diff --git a/system/nixos/convos.nix b/system/nixos/convos.nix
index 5b88820..239a04f 100644
--- a/system/nixos/convos.nix
+++ b/system/nixos/convos.nix
@@ -25,10 +25,6 @@
   systemd.services.podman-convos = {
     bindsTo = [ "wg.service" ];
     after = lib.mkForce [ "wg.service" ];
-
-    serviceConfig = {
-      TimeoutStopSec = lib.mkForce 5;
-    };
   };
 
   services.nginx.virtualHosts."convos.internal.kempkens.network" = {
diff --git a/system/nixos/prowlarr.nix b/system/nixos/prowlarr.nix
index 57cd803..551e048 100644
--- a/system/nixos/prowlarr.nix
+++ b/system/nixos/prowlarr.nix
@@ -22,10 +22,6 @@
   systemd.services.podman-prowlarr = {
     bindsTo = [ "wg.service" ];
     after = lib.mkForce [ "wg.service" ];
-
-    serviceConfig = {
-      TimeoutStopSec = lib.mkForce 5;
-    };
   };
 
   services.nginx.virtualHosts."prowlarr.internal.kempkens.network" = {
diff --git a/system/nixos/qbittorrent.nix b/system/nixos/qbittorrent.nix
index 4cb0e89..bec4bc1 100644
--- a/system/nixos/qbittorrent.nix
+++ b/system/nixos/qbittorrent.nix
@@ -37,10 +37,6 @@
       requires = lib.mkAfter mounts;
       bindsTo = [ "wg.service" ];
       after = lib.mkForce ([ "wg.service" ] ++ mounts);
-
-      serviceConfig = {
-        TimeoutStopSec = lib.mkForce 10;
-      };
     };
 
   services.nginx.virtualHosts."qbittorrent.internal.kempkens.network" = {
diff --git a/system/nixos/radarr.nix b/system/nixos/radarr.nix
index cc2d238..20149af 100644
--- a/system/nixos/radarr.nix
+++ b/system/nixos/radarr.nix
@@ -37,10 +37,6 @@
       requires = lib.mkAfter (mounts ++ depends);
       bindsTo = [ "wg.service" ];
       after = lib.mkForce ([ "wg.service" ] ++ mounts ++ depends);
-
-      serviceConfig = {
-        TimeoutStopSec = lib.mkForce 5;
-      };
     };
 
   services.nginx.virtualHosts."radarr.internal.kempkens.network" = {
diff --git a/system/nixos/sabnzbd.nix b/system/nixos/sabnzbd.nix
index b965447..96a7e75 100644
--- a/system/nixos/sabnzbd.nix
+++ b/system/nixos/sabnzbd.nix
@@ -34,10 +34,6 @@
       requires = lib.mkAfter mounts;
       bindsTo = [ "wg.service" ];
       after = lib.mkForce ([ "wg.service" ] ++ mounts);
-
-      serviceConfig = {
-        TimeoutStopSec = lib.mkForce 10;
-      };
     };
 
   services.nginx.virtualHosts."sabnzbd.internal.kempkens.network" = {
diff --git a/system/nixos/sonarr.nix b/system/nixos/sonarr.nix
index 5aa1abe..0188aed 100644
--- a/system/nixos/sonarr.nix
+++ b/system/nixos/sonarr.nix
@@ -36,10 +36,6 @@
       requires = lib.mkAfter mounts;
       bindsTo = [ "wg.service" ];
       after = lib.mkForce ([ "wg.service" ] ++ mounts);
-
-      serviceConfig = {
-        TimeoutStopSec = lib.mkForce 5;
-      };
     };
 
   services.nginx.virtualHosts."sonarr.internal.kempkens.network" = {