diff --git a/home/jonas/borg.nix b/home/jonas/borg.nix
index 64d077b..d127653 100644
--- a/home/jonas/borg.nix
+++ b/home/jonas/borg.nix
@@ -43,6 +43,9 @@ in {
         sourceDirectories = ["${config.xdg.userDirs.extraConfig.XDG_WORKSPACES_DIR}"];
         repositories = [repo];
         excludeHomeManagerSymlinks = true;
+        extraConfig = {
+          archive_name_format = "{hostname}-workspaces-{now}";
+        };
       };
       retention = {
         keepDaily = 7;
@@ -65,6 +68,9 @@ in {
         ];
         repositories = [repo];
         excludeHomeManagerSymlinks = true;
+        extraConfig = {
+          archive_name_format = "{hostname}-media-{now}";
+        };
       };
       retention = {
         keepDaily = 7;
@@ -84,6 +90,9 @@ in {
         ];
         repositories = [repo];
         excludeHomeManagerSymlinks = true;
+        extraConfig = {
+          archive_name_format = "{hostname}-var-{now}";
+        };
       };
       retention = {
         keepDaily = 7;
diff --git a/modules/bin/nix-scripts.nix b/modules/bin/nix-scripts.nix
index a3ee6c7..274dab8 100644
--- a/modules/bin/nix-scripts.nix
+++ b/modules/bin/nix-scripts.nix
@@ -14,7 +14,7 @@
       sudo nixos-rebuild switch --flake . &>nixos-switch.log || (
       ${pkgs.coreutils-full}/bin/cat nixos-switch.log | ${pkgs.gnugrep}/bin/grep --color error && false)
       gen=$(nixos-rebuild list-generations | ${pkgs.gnugrep}/bin/grep current)
-      ${pkgs.git}/bin/git commit -am "$gen"
+      ${pkgs.git}/bin/git commit --no-gpg-sign -am "$gen"
       popd
     '';
 in {