diff --git a/docs/servers.md b/docs/servers.md
index d0cacde7..f1d57a09 100644
--- a/docs/servers.md
+++ b/docs/servers.md
@@ -100,7 +100,7 @@ So to set up this server from scratch, run:
 
 Medium-fast-ish Kape Arch Linux box.
 
-## runner2.archlinux.org
+## runner3.archlinux.org
 
 Medium-fast-ish Equinix Metal Arch Linux box.
 
diff --git a/host_vars/runner2.archlinux.org/misc b/host_vars/runner2.archlinux.org/misc
deleted file mode 100644
index af638895..00000000
--- a/host_vars/runner2.archlinux.org/misc
+++ /dev/null
@@ -1,15 +0,0 @@
-hostname: "runner2.archlinux.org"
-
-ipv4_address: "147.75.80.217"
-ipv4_netmask: "/31"
-ipv6_address: "2604:1380:2001:4500::3"
-ipv6_netmask: "/127"
-ipv4_gateway: "147.75.80.216"
-ipv6_gateway: "2604:1380:2001:4500::2"
-filesystem: "btrfs"
-network_interface: "enp1s0f0np0"
-system_disks:
-  - /dev/sda
-configure_network: true
-wireguard_address: 10.0.0.7
-wireguard_public_key: 27QE/u1liW2251mHvnika7cZ1Lv8O4h+0S6D2g1jZTE=
diff --git a/host_vars/runner2.archlinux.org/vault_gitlab_runner.yml b/host_vars/runner2.archlinux.org/vault_gitlab_runner.yml
deleted file mode 100644
index adbe0360..00000000
--- a/host_vars/runner2.archlinux.org/vault_gitlab_runner.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-66366439653337376663396637636334383338363036356137306139353830336166663264363163
-3534383537373137636439643934393035656633663036320a613639643661383837336264363333
-35643230343562306235326462356261306135616532376336633365626538646266616561663135
-6631393436366234330a386531656630393732633031343461626539333261633739383431396233
-37663738653630386138363236376535663933386337393635333464613630356463323663653032
-31613034333133306234633762343965663036343732666265383334633732353361303165326131
-333164336535306563613434633334373639
diff --git a/host_vars/runner2.archlinux.org/vault_wireguard.yml b/host_vars/runner2.archlinux.org/vault_wireguard.yml
deleted file mode 100644
index a96ab494..00000000
--- a/host_vars/runner2.archlinux.org/vault_wireguard.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-33383966383362323632353333323966333333336637373133623531356663323430646333356465
-6232616237323161633531353030323161356634336537330a653636656137316264323761633465
-64363239363838663634613761343462613535396262356263353338353265663466643630633033
-3735343363383237610a313338663163386461373038396163306133343965313036323461333338
-32656339313131383737303766656162613534393534303535353462393738303364646335356534
-65633931393463393937393236613336653530313131636663313336663534656166613936633332
-32636636656338616636616236633838653836666165326436363235353365343665363338356335
-34303238303636336536
diff --git a/host_vars/runner3.archlinux.org/misc b/host_vars/runner3.archlinux.org/misc
new file mode 100644
index 00000000..4628a299
--- /dev/null
+++ b/host_vars/runner3.archlinux.org/misc
@@ -0,0 +1,16 @@
+hostname: "runner3.archlinux.org"
+
+ipv4_address: "86.109.5.205"
+ipv4_netmask: "/31"
+ipv6_address: "2604:1380:4091:8800::1"
+ipv6_netmask: "/127"
+ipv4_gateway: "86.109.5.204"
+ipv6_gateway: "2604:1380:4091:8800::"
+filesystem: "btrfs"
+network_interface: "enp2s0f0np0"
+system_disks:
+  - /dev/sda
+  - /dev/sdb
+configure_network: true
+wireguard_address: 10.0.0.41
+wireguard_public_key: V2GA/YWnz0toKZ8GR3w3uzMwgHr5vqMzXVL5d3e1Y0s=
diff --git a/host_vars/runner3.archlinux.org/vault_gitlab_runner.yml b/host_vars/runner3.archlinux.org/vault_gitlab_runner.yml
new file mode 100644
index 00000000..a5741023
--- /dev/null
+++ b/host_vars/runner3.archlinux.org/vault_gitlab_runner.yml
@@ -0,0 +1,8 @@
+$ANSIBLE_VAULT;1.1;AES256
+61393764313032383438646564363862656633353666356433303832386530386333356635643534
+6666353235363964316438316530343033663162376532390a353065376333333566303061343137
+63616134323065636462353762353365353138646237316561313538616339666635326365313231
+6330346138353238350a393164323965626230373438373134613462333665336630666263623330
+34393332343836303662616165303037386362373762353138643339343165636661323638373431
+32303232653563663332663736346264386361393761613337333733336136313662333934643935
+393861313965633937356337373032363637
diff --git a/host_vars/runner3.archlinux.org/vault_wireguard.yml b/host_vars/runner3.archlinux.org/vault_wireguard.yml
new file mode 100644
index 00000000..05902174
--- /dev/null
+++ b/host_vars/runner3.archlinux.org/vault_wireguard.yml
@@ -0,0 +1,9 @@
+$ANSIBLE_VAULT;1.1;AES256
+39326530623136386332396132333331643764663066346233303563323338653362663337333734
+3438343861366463393234306663623533636631323837360a666430646563313266653530383035
+66393931343130613631623634663531386434626266626165373066326433353532353135373436
+6431623763373533330a316664393137383466326435323139333831323865326563303036323135
+36323961323637316636663164383834383634393834363361643431366465376439393661383139
+61303239383061623865653436303261326461303631646534343334363732353661616263363762
+36346537613138323231303433643762323231656461643863643032393337653730393535643539
+61653666653032666564
diff --git a/hosts b/hosts
index 71503165..616d0a67 100644
--- a/hosts
+++ b/hosts
@@ -5,7 +5,7 @@ secure-runner1.archlinux.org
 
 [equinix_metal]
 repro3.pkgbuild.com
-runner2.archlinux.org
+runner3.archlinux.org
 seoul.mirror.pkgbuild.com
 sydney.mirror.pkgbuild.com
 
@@ -75,7 +75,7 @@ build.archlinux.org
 
 [gitlab_runners]
 runner1.archlinux.org
-runner2.archlinux.org
+runner3.archlinux.org
 secure-runner1.archlinux.org
 
 [gitlab_vm_runners]
diff --git a/roles/prometheus/files/node.rules.yml b/roles/prometheus/files/node.rules.yml
index e3b4e15c..136b3410 100644
--- a/roles/prometheus/files/node.rules.yml
+++ b/roles/prometheus/files/node.rules.yml
@@ -3,7 +3,7 @@ groups:
     interval: 60s
     rules:
       - alert: HostHighCpuLoad
-        expr: 100 - (avg by(instance) (irate(node_cpu_seconds_total{mode="idle",instance!~"build.archlinux.org",instance!~"repro3.pkgbuild.com",instance!~"repro2.pkgbuild.com",instance!~"runner2.archlinux.org",instance!~"runner1.archlinux.org"}[10m])) * 100) > 90
+        expr: 100 - (avg by(instance) (irate(node_cpu_seconds_total{mode="idle",instance!~"build.archlinux.org",instance!~"repro3.pkgbuild.com",instance!~"repro2.pkgbuild.com",instance!~"runner1.archlinux.org",instance!~"runner3.archlinux.org"}[10m])) * 100) > 90
         for: 10m
         labels:
           severity: warning
diff --git a/tf-stage1/archlinux.tf b/tf-stage1/archlinux.tf
index 7ad963c9..65806ff6 100644
--- a/tf-stage1/archlinux.tf
+++ b/tf-stage1/archlinux.tf
@@ -266,9 +266,9 @@ locals {
       ipv4_address = "138.199.19.15"
       ipv6_address = "2a02:6ea0:c72e::2"
     }
-    runner2 = {
-      ipv4_address = "147.75.80.217"
-      ipv6_address = "2604:1380:2001:4500::3"
+    runner3 = {
+      ipv4_address = "86.109.5.205"
+      ipv6_address = "2604:1380:4091:8800::1"
     }
     secure-runner1 = {
       ipv4_address = "116.202.134.150"