diff --git a/configuration.nix b/configuration.nix
index c1b846f..b5bf282 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,7 +10,7 @@
       # NOTE: Required bevuta config is part of this file here, and not bevuta specific.
       # ./bevuta-config/bevuta.nix
       ./hardware-configuration.nix
-      "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
+      "${builtins.fetchTarball "https://github.com/khionu/disko/archive/master.tar.gz"}/module.nix"
       ./disko-config.nix
     ];
 
@@ -137,6 +137,7 @@
     wget
     git
     gnumake
+    fido2luks
   ];
 
   programs.virt-manager.enable = true;
@@ -199,6 +200,18 @@
     };
   };
 
+  system.autoUpgrade = {
+    enable = true;
+    flake = inputs.self.outPath;
+    flags = [
+      "--update-input"
+      "nixpkgs"
+      "-L" # print build logs
+    ];
+    dates = "11:00";
+    randomizedDelaySec = "45min";
+  };
+
   # Copy the NixOS configuration file and link it from the resulting system
   # (/run/current-system/configuration.nix). This is useful in case you
   # accidentally delete configuration.nix.