diff --git a/home-manager/common/programs/git.nix b/home-manager/common/programs/git.nix
index 730cf97..28ce80c 100644
--- a/home-manager/common/programs/git.nix
+++ b/home-manager/common/programs/git.nix
@@ -34,8 +34,8 @@ with lib; {
       programs.git = {
         enable = true;
         package = pkgs.gitAndTools.gitFull;
-        userName = "Nathan McCarty";
-        userEmail = "nathan@mccarty.io";
+        userName = lib.mkDefault "Nathan McCarty";
+        userEmail = lib.mkDefault "nathan@mccarty.io";
         ignores = [
           "**/*~"
           "*~"
diff --git a/machines/oracles/automation.nix b/machines/oracles/automation.nix
index 01dc9d6..fc294c2 100644
--- a/machines/oracles/automation.nix
+++ b/machines/oracles/automation.nix
@@ -48,6 +48,24 @@ let
 in lib.mkMerge [
   { # Setup hosts for gitea automation
     networking.hosts = { "100.99.69.14" = [ "git.stranger.systems" ]; };
+    # Setup the bot user
+    users.users."strangerbot" = {
+      home = "/home/strangerbot";
+      description = "Stranger Bot";
+      isNormalUser = true;
+    };
+    home-manager.users."strangerbot" = {
+      programs.git = {
+        enable = true;
+        userName = "Stranger Bot";
+        userEmail = "bot@stranger.systems";
+        extraConfig = {
+          commit.gpgsign = true;
+          gpg.format = "ssh";
+          user.signingkey = "~/.ssh/id_ed25519.pub";
+        };
+      };
+    };
   }
   (update-flake {
     name = "system";