diff --git a/README.md b/README.md
index db328dcda..44e7665be 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![nixbot](https://nixbot.nix-community.org/repos/github/nix-community/infra/badge.svg)](https://nixbot.nix-community.org/repos/github/nix-community/infra)
 
 Welcome to the Nix Community infrastructure project.
-This repo holds all the NixOS, nix-darwin and Terraform configuration for this organization.
+This repo holds all the NixOS, NixBSD, nix-darwin and Terraform configuration for this organization.
 
 You're probably looking for our website [https://nix-community.org](https://nix-community.org).
 
diff --git a/docs/community-builders.md b/docs/community-builders.md
index 3fcbfe43f..bb183d453 100644
--- a/docs/community-builders.md
+++ b/docs/community-builders.md
@@ -1,6 +1,6 @@
 We provide machines as public builders for the nix community.
 
-`x86_64-linux`
+`x86_64-linux`, `x86_64-freebsd`
 
 ```text
 build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIElIQ54qAy7Dh63rBudYKdbzJHrrbrrMXLYl7Pkmk88H
diff --git a/docs/continuous-integration.md b/docs/continuous-integration.md
index f0465c280..ffec08b62 100644
--- a/docs/continuous-integration.md
+++ b/docs/continuous-integration.md
@@ -2,6 +2,7 @@ We provide CI for these platforms:
 
 - `aarch64-darwin`
 - `aarch64-linux`
+- `x86_64-freebsd`
 - `x86_64-linux`
 
 Both `aarch64-linux` and `x86_64-linux` have support for `kvm`/`nixos-test`.
diff --git a/docs/infrastructure.md b/docs/infrastructure.md
index 659f2c07e..ec6d10576 100644
--- a/docs/infrastructure.md
+++ b/docs/infrastructure.md
@@ -7,6 +7,8 @@
 - RAM: 128GB DDR4 ECC
 - Drives: 2 x 1.92TB NVME
 
+This machine also hosts a NixBSD VM configured as a nix remote builder (`x86_64-freebsd`).
+
 ```json
 --8<-- "docs/build01.json"
 ```
@@ -45,6 +47,8 @@
 - RAM: 256GB DDR5 ECC
 - Drives: 2 x 1.92TB NVME
 
+This machine also hosts a NixBSD VM configured as a nix remote builder (`x86_64-freebsd`).
+
 ```json
 --8<-- "docs/build03.json"
 ```
diff --git a/docs/package-sets.md b/docs/package-sets.md
index 8356c886d..0e7e23706 100644
--- a/docs/package-sets.md
+++ b/docs/package-sets.md
@@ -1,3 +1,13 @@
+#### Nixpkgs FreeBSD
+
+[nix-community bsd jobset](https://github.com/nix-community/infra/blob/master/hydra/bsd.nix)
+
+Built on `nixos-unstable-small` and `staging-next` for `x86_64-freebsd`:
+
+- [https://hydra.nix-community.org/jobset/nixpkgs/bsd](https://hydra.nix-community.org/jobset/nixpkgs/bsd)
+
+- [https://hydra.nix-community.org/jobset/nixpkgs/bsd-staging-next](https://hydra.nix-community.org/jobset/nixpkgs/bsd-staging-next)
+
 #### Nixpkgs unfree redistributable
 
 [unfree redistributable release set in nixpkgs](https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/release-unfree-redistributable.nix)
diff --git a/terraform/github-repo-infra.tf b/terraform/github-repo-infra.tf
index 1cf659004..22e383e96 100644
--- a/terraform/github-repo-infra.tf
+++ b/terraform/github-repo-infra.tf
@@ -5,6 +5,7 @@ resource "github_repository" "infra" {
 
   topics = [
     "nix-darwin",
+    "nixbsd",
     "nixos",
     "terraform",
   ]
@@ -19,6 +20,7 @@ resource "github_repository" "infra" {
 
   lifecycle {
     ignore_changes = [
+      ignore_vulnerability_alerts_during_read,
       pages,
       vulnerability_alerts
     ]