diff --git a/ci/systems.json b/ci/systems.json
index 5f85f07a..083f6dba 100644
--- a/ci/systems.json
+++ b/ci/systems.json
@@ -159,6 +159,20 @@
       }
     }
   },
+  "koishi": {
+    "network": {
+      "hostName": "koishi",
+      "networks": {
+        "int": null,
+        "local": {
+          "address4": "10.1.1.68",
+          "address6": null,
+          "macAddress": null
+        },
+        "tail": null
+      }
+    }
+  },
   "kuwubernetes": {
     "network": {
       "hostName": "kuwubernetes",
diff --git a/docs/network.adoc b/docs/network.adoc
index 356176d4..f2632f4a 100644
--- a/docs/network.adoc
+++ b/docs/network.adoc
@@ -38,6 +38,7 @@ satorin:: `10.1.1.64`
 fire10:: `10.1.1.65`
 chromecast:: `10.1.1.66`
 bedroom_tv:: `10.1.1.67`
+koishi:: `10.1.1.68`
 
 outdoor-friend:: `10.1.1.81`
 bedroom-friend:: `10.1.1.82`
diff --git a/systems/koishi/default.nix b/systems/koishi/default.nix
new file mode 100644
index 00000000..d4c2b50c
--- /dev/null
+++ b/systems/koishi/default.nix
@@ -0,0 +1,9 @@
+_: {
+  type = "Linux";
+  network.networks = {
+    local = {
+      address4 = "10.1.1.68";
+      address6 = null; # TODO
+    };
+  };
+}
diff --git a/tf/cloudflare_records.tf b/tf/cloudflare_records.tf
index 419231e7..801fd254 100644
--- a/tf/cloudflare_records.tf
+++ b/tf/cloudflare_records.tf
@@ -177,3 +177,10 @@ module "chen_system_records" {
   zone_zone = cloudflare_zone.gensokyo-zone_zone.zone
   net_data  = local.systems.chen.network
 }
+
+module "koishi_system_records" {
+  source    = "./system/records"
+  zone_id   = cloudflare_zone.gensokyo-zone_zone.id
+  zone_zone = cloudflare_zone.gensokyo-zone_zone.zone
+  net_data  = local.systems.koishi.network
+}