diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index b1f8011..12cd822 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -42,6 +42,9 @@ in
         push = {
           autoSetupRemote = true;
         };
+        rebase = {
+          autoStash = true;
+        };
         safe = {
           directory = "${user.home}/projects/config";
         };
diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix
index f57b32d..dce536d 100644
--- a/modules/nixos/tools/git/default.nix
+++ b/modules/nixos/tools/git/default.nix
@@ -46,6 +46,9 @@ in
           push = {
             autoSetupRemote = true;
           };
+          rebase = {
+            autoStash = true;
+          };
           safe = {
             directory = "${config.users.users.${user.name}.home}/projects/config";
           };
diff --git a/systems/x86_64-linux/loptland/default.nix b/systems/x86_64-linux/loptland/default.nix
index c86e868..805687d 100644
--- a/systems/x86_64-linux/loptland/default.nix
+++ b/systems/x86_64-linux/loptland/default.nix
@@ -142,7 +142,7 @@ in
     };
 
     certificateScheme = "acme-nginx";
-    stateVersion = 2;
+    stateVersion = 3;
   };
 
   nix = {