diff --git a/common/auto-upgrade.nix b/common/auto-upgrade.nix
new file mode 100644
index 0000000..c492e7e
--- /dev/null
+++ b/common/auto-upgrade.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, lib, ... }:
+
+{
+  system.autoUpgrade = {
+    enable = 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.
+      "--refresh"
+      "--override-input" "nixpkgs" "github:NixOS/nixpkgs/nixos-24.11"
+      "--override-input" "nixpkgs-unstable" "github:nixos/nixpkgs/nixos-unstable"
+      "--no-write-lock-file"
+    ];
+  };
+}
diff --git a/flake.nix b/flake.nix
index 4b7e235..9f5b830 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Felixalb System flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; # Remember to update ./common/auto-upgrade.nix
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-2211.url = "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"; # old nixpgks for e.g. remmina
 
diff --git a/hosts/malcolm/configuration.nix b/hosts/malcolm/configuration.nix
index 3f88c55..0d625c3 100644
--- a/hosts/malcolm/configuration.nix
+++ b/hosts/malcolm/configuration.nix
@@ -5,6 +5,7 @@
     ./hardware-configuration.nix
 
     ../../base.nix
+    ../../common/auto-upgrade.nix
     ../../common/metrics-exporters.nix
 
     ./services/mysql.nix
diff --git a/hosts/morn/configuration.nix b/hosts/morn/configuration.nix
index cea0147..1f2871c 100644
--- a/hosts/morn/configuration.nix
+++ b/hosts/morn/configuration.nix
@@ -5,6 +5,7 @@
     [
       ../../base.nix
       ../../common/metrics-exporters.nix
+      ../../common/auto-upgrade.nix
       ./hardware-configuration.nix
   ];