diff --git a/nixos/socrates/configuration.nix b/nixos/socrates/configuration.nix
index 469e2f45d..58b3c64cf 100644
--- a/nixos/socrates/configuration.nix
+++ b/nixos/socrates/configuration.nix
@@ -58,6 +58,13 @@ in {
       shell = pkgs.fish;
     };
 
+    users.buildkite-agent = {
+      # TODO: Consider setting this to `false` when you better understand the
+      # implications.
+      isNormalUser = true;
+      extraGroups = [ "git" ];
+    };
+
     users.git = {
       group = "git";
       isNormalUser = false;