diff --git a/nixos/machines/orbi/borg.nix b/nixos/legacy/borg.nix
similarity index 100%
rename from nixos/machines/orbi/borg.nix
rename to nixos/legacy/borg.nix
diff --git a/nixos/machines/chungus/rbackup.nix b/nixos/machines/chungus/rbackup.nix
index 2684aab..d492344 100644
--- a/nixos/machines/chungus/rbackup.nix
+++ b/nixos/machines/chungus/rbackup.nix
@@ -13,13 +13,12 @@
       src = "root@orbi:/var/lib/forgejo/";
       dst = "/mirror/git";
     };
-    # todo
     taskwarrior = {
       sshKeyPath = config.sops.secrets.rsync_private_key.path;
-      src = "root@robi:/var/lib/taskserver/";
+      src = "root@orbi:/var/lib/taskserver/";
       dst = "/mirror/taskwarrior";
     };
-    bitwarden = {
+    vaultwarden = {
       sshKeyPath = config.sops.secrets.rsync_private_key.path;
       src = "root@orbi:/var/lib/bitwarden_rs/";
       dst = "/mirror/vaultwarden";
diff --git a/nixos/machines/orbi/configuration.nix b/nixos/machines/orbi/configuration.nix
index d6e2e0f..165f7fb 100644
--- a/nixos/machines/orbi/configuration.nix
+++ b/nixos/machines/orbi/configuration.nix
@@ -11,12 +11,8 @@
 
     ./service-hedgedoc.nix
     ./service-forgejo.nix
-
-    # todo
     ./service-vaultwarden.nix
-
-    #./borg.nix
-    #./taskserver.nix
+    ./service-taskserver.nix
 
     ./nginx-ingolf-wagner-de.nix
     ./nginx-wkd.nix
@@ -26,12 +22,10 @@
 
     ./media-share.nix
 
-    # todo
-    ./media-jellyfin.nix
-
     #./media-syncthing.nix
     #./media-transmission.nix
     ./media-transmission2.nix
+    ./media-jellyfin.nix
     ./media-arr.nix
     ./media-nextcloud.nix
 
diff --git a/nixos/machines/orbi/taskserver.nix b/nixos/machines/orbi/service-taskserver.nix
similarity index 100%
rename from nixos/machines/orbi/taskserver.nix
rename to nixos/machines/orbi/service-taskserver.nix
diff --git a/nixos/machines/robi/configuration.nix b/nixos/machines/robi/configuration.nix
index a33fb34..d727fb4 100644
--- a/nixos/machines/robi/configuration.nix
+++ b/nixos/machines/robi/configuration.nix
@@ -14,7 +14,7 @@
     #./gitea.nix
     #./nextcloud.nix
     ./packages.nix
-    ./taskserver.nix
+    #./taskserver.nix
     #./vaultwarden.nix
     #./nginx.nix
     #./nginx-wkd.nix