diff --git a/modules/default.nix b/modules/default.nix
index 3247ca4..dcfb44a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -10,6 +10,7 @@ let
     hydra = import ./hydra;
     hyprspace = import ./hyprspace;
     ipfs = import ./ipfs;
+    maintenance = import ./maintenance;
     nix-builder = import ./nix-builder;
     nix-config = import ./nix-config;
     nix-config-server = import ./nix-config/server.nix;
@@ -26,6 +27,7 @@ in rec {
     base = [ 
       autopatch
       enterprise
+      maintenance
     ];
 
     networking = [
diff --git a/modules/maintenance/default.nix b/modules/maintenance/default.nix
new file mode 100644
index 0000000..7246e7f
--- /dev/null
+++ b/modules/maintenance/default.nix
@@ -0,0 +1,15 @@
+{
+  systemd.targets.maintenance = {
+    unitConfig.AllowIsolate = true;
+    wants = [
+      "basic.target"
+      "getty.target"
+      "network.target"
+      "network-online.target"
+      "sshd.service"
+      "fail2ban.service"
+      "hyprspace.service"
+      "dbus.service"
+    ];
+  };
+}