diff --git a/hosts/minecraft-2/configuration.nix b/hosts/minecraft-2/configuration.nix
index 805e088..3a893b0 100644
--- a/hosts/minecraft-2/configuration.nix
+++ b/hosts/minecraft-2/configuration.nix
@@ -62,6 +62,11 @@ in {
     };
   };
 
+  clerie.nixfiles.system-auto-upgrade = {
+    allowReboot = true;
+    autoUpgrade = true;
+  };
+
   clerie.monitoring = {
     enable = true;
     id = "202";
diff --git a/hosts/storage-2/configuration.nix b/hosts/storage-2/configuration.nix
index de08aad..4aaea5a 100644
--- a/hosts/storage-2/configuration.nix
+++ b/hosts/storage-2/configuration.nix
@@ -26,6 +26,11 @@
 
   networking.firewall.allowedTCPPorts = [ 80 443 ];
 
+  clerie.nixfiles.system-auto-upgrade = {
+    allowReboot = true;
+    autoUpgrade = true;
+  };
+
   clerie.monitoring = {
     enable = true;
     id = "209";
diff --git a/hosts/storage-2/mixcloud.nix b/hosts/storage-2/mixcloud.nix
index a8a0ed0..7b81c0d 100644
--- a/hosts/storage-2/mixcloud.nix
+++ b/hosts/storage-2/mixcloud.nix
@@ -82,17 +82,10 @@ in {
   };
   users.groups.data-mixcloud = {};
 
-  systemd.services = {
-    "youtube-dl-prepare" = {
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = "true";
-      };
-      script = ''
-        mkdir -p /data/mixcloud
-        chown -R data-mixcloud:data-mixcloud /data/mixcloud
-      '';
-    };
-  } // (mapAttrs' generateYoutubedlMixcloudUnits mixcloudSources);
+  systemd.tmpfiles.rules = [
+    "d /data/mixcloud - data-mixcloud data-mixcloud - -"
+  ];
+
+  systemd.services = (mapAttrs' generateYoutubedlMixcloudUnits mixcloudSources);
   systemd.timers = (mapAttrs' generateYoutubedlMixcloudTimers mixcloudSources);
 }
diff --git a/hosts/web-2/configuration.nix b/hosts/web-2/configuration.nix
index 2bf471f..76b8817 100644
--- a/hosts/web-2/configuration.nix
+++ b/hosts/web-2/configuration.nix
@@ -26,7 +26,6 @@
       ./tap.nix
       ./uptimestatus.nix
       ./wetter.nix
-      ./znc.nix
     ];
 
   boot.loader.grub.enable = true;
diff --git a/hosts/web-2/znc.nix b/hosts/web-2/znc.nix
deleted file mode 100644
index fa6cb09..0000000
--- a/hosts/web-2/znc.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ ... }:
-
-{
-  services.znc = {
-    enable = true;
-    mutable = true;
-    dataDir = "/var/lib/znc";
-    configFile = "/var/lib/znc/configs/znc.conf";
-  };
-
-  services.nginx.virtualHosts = {
-    "znc.clerie.de" = {
-      enableACME = true;
-      forceSSL = true;
-      locations."/" = {
-        proxyPass = "http://127.0.0.1:1313";
-      };
-    };
-  };
-
-  clerie.nginx-port-forward = {
-    enable = true;
-    tcpPorts."6697" = {
-      host = "127.0.0.1";
-      port = 1311;
-      certName = "znc.clerie.de";
-    };
-  };
-}