diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix
index 413b070c3143..ec5555d62af9 100644
--- a/pkgs/by-name/fo/forgejo/generic.nix
+++ b/pkgs/by-name/fo/forgejo/generic.nix
@@ -12,6 +12,7 @@
   bash,
   brotli,
   buildGoModule,
+  coreutils,
   fetchpatch,
   forgejo,
   git,
@@ -79,6 +80,9 @@ buildGoModule rec {
     git
     openssh
     writableTmpDirAsHomeHook
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "16") [
+    coreutils
   ];
 
   patches = [
@@ -116,6 +120,23 @@ buildGoModule rec {
 
     # TestRunHookPrePostReceive (cmd/hook_test.go) needs .git to pass
     git init
+  ''
+  # Unlike NixOS, the Nix build sandbox has no /usr/bin/env and we
+  # can't just create it, so Forgejo trying to execute git hooks
+  # that have #!/usr/bin/env as shebang fails with:
+  #
+  #  To /build/repos44353414/user2/repo1.wiki.git
+  #   ! [remote rejected] fda09356fb8b1da00546f764933f9dacda1b44ea -> master (pre-receive hook declined)
+  #  error: failed to push some refs to '/build/repos44353414/user2/repo1.wiki.git'
+  #   - remote: fatal: cannot exec '/build/appdata2719412950/home/hooks/pre-receive': No such file or directory
+  #
+  # We also can't just call patchShebangs because the hooks are
+  # created just in time by the test suite. Patching the source of
+  # the hooks after go build but before go test is oddly enough
+  # the least invasive hack to have those tests pass.
+  + lib.optionalString (lib.versionAtLeast version "16") ''
+    substituteInPlace modules/git/hook_generate.go \
+      --replace-fail "#!/usr/bin/env" "#!${lib.getExe' coreutils "env"}"
   '';
 
   checkFlags =
@@ -124,6 +145,11 @@ buildGoModule rec {
         "TestPassword" # requires network: api.pwnedpasswords.com
         "TestCaptcha" # requires network: hcaptcha.com
         "TestDNSUpdate" # requires network: release.forgejo.org
+      ]
+      ++ lib.optionals (lib.versionAtLeast version "16") [
+        "TestMigrateRepository" # requires network: codeberg.org
+      ]
+      ++ [
         "TestMigrateWhiteBlocklist" # requires network: gitlab.com (DNS)
         "TestURLAllowedSSH/Pushmirror_URL" # requires network git.gay (DNS)
         "TestBleveDeleteIssue" # Known Flake-y https://github.com/NixOS/nixpkgs/issues/509878
diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
deleted file mode 120000
index 8d225ed3269a..000000000000
--- a/pkgs/by-name/fo/forgejo/lts.nix
+++ /dev/null
@@ -1 +0,0 @@
-package.nix
\ No newline at end of file
diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
new file mode 100644
index 000000000000..6c4609ae7b43
--- /dev/null
+++ b/pkgs/by-name/fo/forgejo/lts.nix
@@ -0,0 +1,11 @@
+import ./generic.nix {
+  version = "15.0.5";
+  hash = "sha256-S+x/YEfQrYIzHLnZ7LDLnkMYVN3TajwS7SHydM8uMPQ=";
+  npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg=";
+  vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig=";
+  lts = true;
+  nixUpdateExtraArgs = [
+    "--override-filename"
+    "pkgs/by-name/fo/forgejo/lts.nix"
+  ];
+}
diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 474e72baff85..a192df6c43b6 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,9 +1,9 @@
 import ./generic.nix {
-  version = "15.0.5";
-  hash = "sha256-S+x/YEfQrYIzHLnZ7LDLnkMYVN3TajwS7SHydM8uMPQ=";
-  npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg=";
-  vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig=";
-  lts = true;
+  version = "16.0.0";
+  hash = "sha256-BZawFbrtcxftX4/Yk32aoVRQ6Kg+k1FhN9IoH6dxvVY=";
+  npmDepsHash = "sha256-UhivpUqNJvc3zHxdRVAWT9x68jG1KnQa8yS4KkL2W5g=";
+  vendorHash = "sha256-cb6f7ZX3pG95EEZotGXn6+YUJN59SFNVHFTejFJ6y28=";
+  lts = false;
   nixUpdateExtraArgs = [
     "--override-filename"
     "pkgs/by-name/fo/forgejo/package.nix"