diff --git a/server-modules/arr.nix b/server-modules/arr.nix
index 680fe0c8..9be053f0 100644
--- a/server-modules/arr.nix
+++ b/server-modules/arr.nix
@@ -30,13 +30,14 @@ in {
     };
 
     jellyfin.enable = true;
-    jellyseerr.enable = true;
+    seerr.enable = true;
     prowlarr.enable = true;
     radarr.enable = true;
     sonarr.enable = true;
     bazarr.enable = true;
     transmission = {
       enable = true;
+      peerPort = 50000;
       extraSettings = {
         trash-original-torrent-files = true;
         rpc-whitelist-enabled = false;
diff --git a/server-modules/cloudflared.nix b/server-modules/cloudflared.nix
index d83251b7..196b3949 100644
--- a/server-modules/cloudflared.nix
+++ b/server-modules/cloudflared.nix
@@ -26,8 +26,15 @@
 
   systemd.services."cloudflared-tunnel-${config.var.tunnelId}" = {
     wantedBy = ["multi-user.target"];
-    after = ["network-online.target"];
+    after = ["network-online.target" "adguardhome.service"];
     wants = ["network-online.target"];
+    requires = ["adguardhome.service"];
+    serviceConfig = {
+      Restart = "on-failure";
+      RestartSec = "5s";
+      StartLimitIntervalSec = 300;
+      StartLimitBurst = 10;
+    };
   };
 
   # At the moment (2025), for support of browser rendering of the tunnels, this line is required:
diff --git a/server-modules/cyberchef.nix b/server-modules/cyberchef.nix
index b562e063..ce97aff8 100644
--- a/server-modules/cyberchef.nix
+++ b/server-modules/cyberchef.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs-unstable,
   ...
 }: let
   inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
@@ -10,7 +11,7 @@ in {
       name = "cyberchef";
       hostIp = "10.233.5.1";
       containerIp = "10.233.5.2";
-      nixosConfig = {pkgs-unstable, ...}: {
+      nixosConfig = {...}: {
         services.nginx = {
           enable = true;
           virtualHosts."cyberchef" = {
diff --git a/server-modules/default-creds.nix b/server-modules/default-creds.nix
index 76484797..5bcf0cca 100644
--- a/server-modules/default-creds.nix
+++ b/server-modules/default-creds.nix
@@ -14,7 +14,7 @@ in {
       containerIp = "10.233.6.2";
       nixosConfig = {...}: {
         imports = [inputs.default-creds-web.nixosModules.default];
-        services.default-creds = {
+        services.default-creds-web = {
           enable = true;
           port = 8087;
         };
@@ -31,7 +31,5 @@ in {
     })
   ];
 
-  # TODO: ??
-  services.default-creds.enable = lib.mkForce false;
   services.cloudflared.tunnels."${config.var.tunnelId}".ingress."default-creds.${config.var.domain}" = "http://10.233.6.2:8087";
 }
diff --git a/server-modules/mazanoke.nix b/server-modules/mazanoke.nix
index a71f76a1..7a84da7b 100644
--- a/server-modules/mazanoke.nix
+++ b/server-modules/mazanoke.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs-unstable,
   ...
 }: let
   inherit (import ./mk-container.nix {inherit lib config;}) mkContainer;
@@ -10,7 +11,7 @@ in {
       name = "mazanoke";
       hostIp = "10.233.7.1";
       containerIp = "10.233.7.2";
-      nixosConfig = {pkgs-unstable, ...}: let
+      nixosConfig = {...}: let
         version = "1.1.5";
         mazanoke-pkg = pkgs-unstable.stdenv.mkDerivation {
           inherit version;