diff --git a/hosts/flame/default.nix b/hosts/flame/default.nix
index 4ddacd9..37cf75f 100644
--- a/hosts/flame/default.nix
+++ b/hosts/flame/default.nix
@@ -79,6 +79,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
       services.gitea.enable = true;
       services.vaultwarden.enable = true;
       services.minecraft-server.enable = true; # Setup Minecraft server
+      system.autoUpgrade.enable = true;
 
       # Allows private remote access over the internet
       cloudflareTunnel = {
diff --git a/hosts/swan/default.nix b/hosts/swan/default.nix
index 35b8732..46ff956 100644
--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@@ -107,6 +107,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
       services.samba.enable = true;
       services.paperless.enable = true;
       services.postgresql.enable = true;
+      system.autoUpgrade.enable = false;
 
       # Allows private remote access over the internet
       cloudflareTunnel = {
diff --git a/modules/nixos/system/auto-upgrade.nix b/modules/nixos/system/auto-upgrade.nix
index fc51ec4..3873c92 100644
--- a/modules/nixos/system/auto-upgrade.nix
+++ b/modules/nixos/system/auto-upgrade.nix
@@ -11,7 +11,7 @@
 
   # Update the system daily by pointing it at the flake repository
   system.autoUpgrade = {
-    enable = config.server; # Only auto upgrade servers
+    enable = lib.mkDefault false; # Don't enable by default
     dates = "09:33";
     flake = "git+${config.dotfilesRepo}";
     randomizedDelaySec = "25min";