diff --git a/flake.nix b/flake.nix
index 3be03b84..ffcb8d58 100644
--- a/flake.nix
+++ b/flake.nix
@@ -178,7 +178,7 @@
         systemModules = [
           ./services/nix-serve.nix
           ./services/caddy.nix
-          ./services/gitea.nix
+          ./services/forgejo.nix
           ./services/grafana.nix
           ./services/minecraft.nix
           ./services/sshd.nix
diff --git a/hosts/Legion/configuration.nix b/hosts/Legion/configuration.nix
index acfb4f9d..4188d918 100644
--- a/hosts/Legion/configuration.nix
+++ b/hosts/Legion/configuration.nix
@@ -1,14 +1,13 @@
-{config, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   users.mutableUsers = false;
   system.autoUpgrade = {
     enable = true;
     flake = "git+${config.nix.registry.nixos.to.url}";
-    flags = [
-      "--update-input"
-      "nixpkgs"
-      "--no-write-lock-file"
-      "-L" # print build logs
-    ];
+    flags = ["-L"]; # Print build logs
     dates = "02:00";
     randomizedDelaySec = "15min";
     allowReboot = true;
@@ -17,4 +16,5 @@
       upper = "05:00";
     };
   };
+  environment.systemPackages = with pkgs; [nil];
 }
diff --git a/services/forgejo.nix b/services/forgejo.nix
new file mode 100644
index 00000000..8987b520
--- /dev/null
+++ b/services/forgejo.nix
@@ -0,0 +1,21 @@
+{...}: {
+  imports = [./caddy.nix];
+  services = {
+    forgejo = {
+      enable = true;
+      settings = {
+        server = {
+          ROOT_URL = "https://git.xenia.me.uk";
+          DOMAIN = "git.xenia.me.uk";
+          HTTP_ADDR = "127.0.0.1";
+          HTTP_PORT = 3100;
+          DISABLE_SSH = true;
+        };
+        ui = {DEFAULT_THEME = "auto";};
+        admin = {DISABLE_REGULAR_ORG_CREATION = true;};
+        service = {DISABLE_REGISTRATION = true;};
+      };
+    };
+    caddy.virtualHosts."git.xenia.me.uk".extraConfig = "reverse_proxy http://localhost:3100";
+  };
+}