diff --git a/host_vars/lists.archlinux.org b/host_vars/lists.archlinux.org
deleted file mode 100644
index c162214f42b7163cfa681b52347443df3fb6fc3e..0000000000000000000000000000000000000000
--- a/host_vars/lists.archlinux.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-filesystem: btrfs
-ipv4_address: 95.217.236.249
diff --git a/host_vars/lists.archlinux.org/misc b/host_vars/lists.archlinux.org/misc
new file mode 100644
index 0000000000000000000000000000000000000000..d83dbe76eecb5d6ae01bb5feb10387ba267c94ed
--- /dev/null
+++ b/host_vars/lists.archlinux.org/misc
@@ -0,0 +1,5 @@
+---
+filesystem: btrfs
+ipv4_address: 95.217.236.249
+wireguard_address: 10.0.0.1
+wireguard_public_key: 7P+MFnOgHK3uyaX5IjPGJ1Sxo72BdWbZKC/wYHpwfUE=
diff --git a/host_vars/lists.archlinux.org/vault_wireguard.yml b/host_vars/lists.archlinux.org/vault_wireguard.yml
new file mode 100644
index 0000000000000000000000000000000000000000..700aff061ae84dd944edb31aad1a08aafb5e665d
--- /dev/null
+++ b/host_vars/lists.archlinux.org/vault_wireguard.yml
@@ -0,0 +1,9 @@
+$ANSIBLE_VAULT;1.1;AES256
+30386665653661666431653861316366663932343063306131333838343865653132353962633539
+6131333834333336623530373130623631373666386231350a326564333836336530383431353963
+32366233626631383563616432643132316634633062343865316561613462366564303963643530
+6366326437386664310a616234323239323065336236653264666238323233636135393236313634
+38353465343932353163383337613866313466333731326231303065376138393938346432366131
+65313238626561303233383965373236346564653061636561346337343264363133346462323232
+32363438663334333365323438353931616266343366343165306631613666396264303666656362
+35326537383964653935
diff --git a/host_vars/mailman3.archlinux.org b/host_vars/mailman3.archlinux.org
deleted file mode 100644
index 54346deaf05a9ac147fc70e59a2f8302c1f9b394..0000000000000000000000000000000000000000
--- a/host_vars/mailman3.archlinux.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-filesystem: btrfs
-ipv4_address: 65.21.106.94
diff --git a/host_vars/mailman3.archlinux.org/misc b/host_vars/mailman3.archlinux.org/misc
new file mode 100644
index 0000000000000000000000000000000000000000..5a03014715e5258febce250188d3552ec81ec5dc
--- /dev/null
+++ b/host_vars/mailman3.archlinux.org/misc
@@ -0,0 +1,5 @@
+---
+filesystem: btrfs
+ipv4_address: 65.21.106.94
+wireguard_address: 10.0.0.2
+wireguard_public_key: obBFreFGNDLB17+PaJspE4qNeVX4o7ZPcJj3ZmJhahg=
diff --git a/host_vars/mailman3.archlinux.org/vault_wireguard.yml b/host_vars/mailman3.archlinux.org/vault_wireguard.yml
new file mode 100644
index 0000000000000000000000000000000000000000..dd4965fa5112492b794df6f8b6e7b2cbcecbf014
--- /dev/null
+++ b/host_vars/mailman3.archlinux.org/vault_wireguard.yml
@@ -0,0 +1,9 @@
+$ANSIBLE_VAULT;1.1;AES256
+66656238613063383133353765323966656638396230336461366564306566323232356262336362
+3565373965363634623939626139336638383034373338390a316566383963643935663536326436
+61366538663931313037386363666234633031376663303330346564346439323139666566346238
+6236336638373364350a316463336433386363363430626437326463323935316463666166353561
+63623363353763633936326131613639336637646363326137653638303061666636343237353164
+30666537613964643234333165353066636363343666316664323631303335623861303233633837
+62336665653432393937623839323334336261376564343130386665333335386131366633373130
+62313639626130383636
diff --git a/hosts b/hosts
index 7cbaf5d4f4f339b5310ed93ed6343410a8979c8b..61d62a9cf6c740e93bca88afa9e1f526bbe00cc2 100644
--- a/hosts
+++ b/hosts
@@ -150,6 +150,8 @@ lists.archlinux.org
 mailman3.archlinux.org
 
 [wireguard]
+lists.archlinux.org
+mailman3.archlinux.org
 
 [kape_servers]
 asia.mirror.pkgbuild.com
diff --git a/playbooks/lists.archlinux.org.yml b/playbooks/lists.archlinux.org.yml
index a20dea7ac0b693f11cba23590231bfe4683dcd48..af2e515c2f290eb399cca091a696e47f32b39cd8 100644
--- a/playbooks/lists.archlinux.org.yml
+++ b/playbooks/lists.archlinux.org.yml
@@ -4,6 +4,7 @@
   roles:
     - { role: common }
     - { role: firewalld }
+    - { role: wireguard }
     - { role: tools }
     - { role: sshd }
     - { role: root_ssh }
diff --git a/playbooks/mailman3.archlinux.org b/playbooks/mailman3.archlinux.org
index ac66dcb68a9f322bd49fd317e39ea652c757e0b4..0dbeb6e0dbea5b0211014efdf864d85427d62554 100644
--- a/playbooks/mailman3.archlinux.org
+++ b/playbooks/mailman3.archlinux.org
@@ -4,6 +4,7 @@
   roles:
     - { role: common }
     - { role: firewalld }
+    - { role: wireguard }
     - { role: tools }
     - { role: sshd }
     - { role: root_ssh }