diff --git a/configs/moodle-dl/borsfaye.nix b/configs/moodle-dl/borsfaye.nix
index f48cb0e..d9ddb5c 100644
--- a/configs/moodle-dl/borsfaye.nix
+++ b/configs/moodle-dl/borsfaye.nix
@@ -5,22 +5,27 @@ let
   });
 in
 {
-  imports = [ <niveum/modules/moodle-dl.nix> ];
+  containers.moodle-dl-borsfaye = {
+    autoStart = true;
+    config = { lib, pkgs, ...}: {
+      imports = [ <niveum/modules/moodle-dl.nix> ];
 
-  services.moodle-dl = {
-    enable = true;
-    startAt = "hourly";
-    package = moodle-dl-package;
-    notifyOnly = true;
-    settings = {
-      telegram = {
-        token = lib.strings.fileContents <system-secrets/telegram/moodle-dl.token>;
-        chat_id = "311425510";
-        send_error_msg = false;
+      services.moodle-dl = {
+        enable = true;
+        startAt = "hourly";
+        package = moodle-dl-package;
+        notifyOnly = true;
+        settings = {
+          telegram = {
+            token = lib.strings.fileContents <system-secrets/telegram/moodle-dl.token>;
+            chat_id = "311425510";
+            send_error_msg = false;
+          };
+          token = lib.strings.fileContents <system-secrets/moodle-dl/faye.token>;
+          moodle_domain = "moodle.hu-berlin.de";
+          moodle_path = "/";
+        };
       };
-      token = lib.strings.fileContents <system-secrets/moodle-dl/faye.token>;
-      moodle_domain = "moodle.hu-berlin.de";
-      moodle_path = "/";
     };
   };
 }
diff --git a/configs/moodle-dl/meinhark.nix b/configs/moodle-dl/meinhark.nix
index 50765e6..9b20a8a 100644
--- a/configs/moodle-dl/meinhark.nix
+++ b/configs/moodle-dl/meinhark.nix
@@ -66,10 +66,10 @@ in
       cert = toString <system-secrets/syncthing/cert.pem>;
       key = toString <system-secrets/syncthing/key.pem>;
       devices = {
-        inherit ((import <niveum/lib>).syncthing.devices) wilde manakish toum;
+        inherit ((import <niveum/lib>).syncthing.devices) wilde manakish zaatar;
       };
       folders.${moodle-dl-directory} = {
-        devices = [ "toum" "wilde" "manakish" ];
+        devices = [ "zaatar" "wilde" "manakish" ];
         id = "moodle-dl";
       };
     };