diff --git a/modules/desktop-environment.nix b/modules/desktop-environment.nix
index e4eb0ed..7ac36ae 100644
--- a/modules/desktop-environment.nix
+++ b/modules/desktop-environment.nix
@@ -84,7 +84,7 @@
 
       # prevent stuck units from preventing shutdown (default is 120s)
       extraConfig = ''
-        DefaultTimeoutStopSec=12s
+        DefaultTimeoutStopSec=10s
       '';
     };
 
@@ -108,5 +108,10 @@
       enable = true;
       enableGraphical = true;
     };
+
+    system.autoUpgrade = {
+      allowReboot = false;
+      operation = "boot";
+    };
   };
 }