diff --git a/apps/nogui/jj.nix b/apps/nogui/jj.nix
index 5d80275147b33833197dc32299f7659af531095d..4ac591d1d515095a06297f54dbbf1d1cd343a251 100644
--- a/apps/nogui/jj.nix
+++ b/apps/nogui/jj.nix
@@ -20,7 +20,7 @@         default-command = "log";
       };
       git.push-bookmark-prefix = "change/";
       signing = {
-        behavior = "own";
+        sign-all = true;
         backend = "ssh";
         key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
       };
diff --git a/machines/common/nogui/default.nix b/machines/common/nogui/default.nix
index 43c60e4bafec491ae59307a948612c5b51e1f52d..2c42961affa1c24d8766f87b7cb05b472331e7c4 100644
--- a/machines/common/nogui/default.nix
+++ b/machines/common/nogui/default.nix
@@ -43,11 +43,7 @@
   nixpkgs.config.allowUnfree = true;
 
   nix = {
-    gc = {
-      automatic = true;
-      randomizedDelaySec = "15m";
-      options = [ "--delete-older-than 14d" ];
-    };
+    gc.automatic = true;
     optimise.automatic = true;
     package = pkgs.nixVersions.stable;
     settings = {