diff --git a/base.nix b/base.nix
index b1bdf2e..fab9dba 100644
--- a/base.nix
+++ b/base.nix
@@ -1,6 +1,10 @@
 { config, lib, pkgs, inputs, values, ... }:
 
 {
+  imports = [
+      ./common/auto-upgrade.nix
+  ];
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
diff --git a/common/auto-upgrade.nix b/common/auto-upgrade.nix
index 53a3970..34024f7 100644
--- a/common/auto-upgrade.nix
+++ b/common/auto-upgrade.nix
@@ -2,7 +2,7 @@
 
 {
   system.autoUpgrade = {
-    enable = true;
+    enable = lib.mkDefault true;
     flake = "git+https://git.feal.no/felixalb/nixos-config.git";
     flags = [
       # Override nixpkgs (only). Notably does not include home-manager, sops or other utility/application flake inputs.
diff --git a/hosts/fa-t14-2025/configuration.nix b/hosts/fa-t14-2025/configuration.nix
index 5274433..6ed6e9b 100644
--- a/hosts/fa-t14-2025/configuration.nix
+++ b/hosts/fa-t14-2025/configuration.nix
@@ -13,6 +13,8 @@
     ./desktop.nix
   ];
 
+  system.autoUpgrade = false;
+
   networking = {
     networkmanager.enable = true;
     wireguard.enable = true;
diff --git a/hosts/leonard/configuration.nix b/hosts/leonard/configuration.nix
index 4ae30de..2c87e75 100644
--- a/hosts/leonard/configuration.nix
+++ b/hosts/leonard/configuration.nix
@@ -5,7 +5,6 @@
     [
       ../../base.nix
       ../../common/metrics-exporters.nix
-      ../../common/auto-upgrade.nix
       ./hardware-configuration.nix
 
       ./backup.nix
diff --git a/hosts/morn/configuration.nix b/hosts/morn/configuration.nix
index db76421..f1ca62b 100644
--- a/hosts/morn/configuration.nix
+++ b/hosts/morn/configuration.nix
@@ -5,7 +5,6 @@
     [
       ../../base.nix
       ../../common/metrics-exporters.nix
-      ../../common/auto-upgrade.nix
       ./hardware-configuration.nix
 
       ./services/nginx.nix