diff --git a/flake.nix b/flake.nix
index 414ab13..9de95a8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -106,6 +106,7 @@
             ./modules/docker
             ./modules/espanso
           ];
+        # Servers
         proxy = mkComputer
           ./systems/proxy
           ./home-manager/headless.nix
@@ -154,16 +155,10 @@
           ./systems/pihole
           ./home-manager/headless.nix
           [ ];
-
         jdownloader = mkComputer
-          (mkVM
-            { hostname = "jdownloader"; ip = "10.7.89.110"; inherit custom inputs; })
+          ./systems/jdownloader
           ./home-manager/headless.nix
-          [
-            ./modules/docker
-            ./modules/download-share
-            ./modules/jdownloader
-          ];
+          [ ];
       };
       homeConfigurations = {
         "${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration {
diff --git a/systems/jdownloader/default.nix b/systems/jdownloader/default.nix
new file mode 100644
index 0000000..a41f3c7
--- /dev/null
+++ b/systems/jdownloader/default.nix
@@ -0,0 +1,16 @@
+{ config, custom, inputs, pkgs, ... }:
+{
+  imports = [
+    (import "${inputs.self}/systems/proxmox-vm" {
+      hostname = "jdownloader";
+      ip = "10.7.89.110";
+      inherit inputs;
+    })
+    (import "${inputs.self}/modules/restic-server-client" {
+      time = "04:30"; inherit config custom inputs pkgs;
+    })
+    "${inputs.self}/modules/docker"
+    "${inputs.self}/modules/download-share"
+    "${inputs.self}/modules/jdownloader"
+  ];
+}