diff --git a/infra/README.md b/infra/README.md
index e69ad00c..0643ed54 100644
--- a/infra/README.md
+++ b/infra/README.md
@@ -111,6 +111,9 @@ default
 `other`
 :   Machines without a specific purpose
 
+`hans`
+:   Testing machines for Hans's work
+
 ## Machines
 
 These machines are hosted on the Procolix Proxmox instance,
@@ -123,4 +126,5 @@ They host our stable infrastructure.
   vm02179   Procolix      *unused*                 `other`
   vm02186   Procolix      *unused*                 `other`
   vm02187   Procolix      Wiki                     `web`
+  fedi200   Fediversity   Testing machine for Hans `hans`
   fedi300   Fediversity   Forgejo actions runner   `git`
diff --git a/infra/fedi200/default.nix b/infra/fedi200/default.nix
new file mode 100644
index 00000000..b8db0479
--- /dev/null
+++ b/infra/fedi200/default.nix
@@ -0,0 +1,13 @@
+{
+  fediversityVm = {
+    domain = "abundos.eu";
+    ipv4 = {
+      address = "95.215.187.200";
+      gateway = "95.215.187.1";
+    };
+    ipv6 = {
+      address = "2a00:51c0:13:1305::200";
+      gateway = "2a00:51c0:13:1305::1";
+    };
+  };
+}
diff --git a/infra/flake-part.nix b/infra/flake-part.nix
index 22c8afb8..496ab033 100644
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@@ -83,6 +83,9 @@ let
       "vm02179"
       "vm02186"
     ];
+    hans = [
+      "fedi200"
+    ];
   };
 
 in
diff --git a/keys/systems/fedi200.pub b/keys/systems/fedi200.pub
new file mode 100644
index 00000000..f53d6bda
--- /dev/null
+++ b/keys/systems/fedi200.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEIndY+B2WnEwm9K+RW8wFWtHPvcYEW4gHQmu6UhLILS root@fedi200