diff --git a/docs/ssh-hostkeys.txt b/docs/ssh-hostkeys.txt
index 955aef68..b9250f6c 100644
--- a/docs/ssh-hostkeys.txt
+++ b/docs/ssh-hostkeys.txt
@@ -141,6 +141,17 @@
 256 MD5:3b:a2:48:8c:33:ac:8b:74:43:d4:4f:f1:fc:78:be:20 root@archlinux-packer (ED25519)
 3072 MD5:a3:ce:cf:2c:59:05:5d:eb:a0:1f:fb:30:81:cc:07:d8 root@archlinux-packer (RSA)
 
+# gluebuddy.archlinux.org
+1024 SHA256:eKv7TBDRnYRCA/DtyNOAezBL1p/G2zbqCYsyUIRYAWw root@archlinux-packer (DSA)
+256 SHA256:Y7pKFVFPyk11342/vbPx7G/oOBJMOuT2NpVn5sCNGu4 root@archlinux-packer (ECDSA)
+256 SHA256:Ps4iPggiQbEis2m/RhcmVl+7rjvoOZp8Yr0uV3FJC9c root@archlinux-packer (ED25519)
+3072 SHA256:3uiGaWronYWQzaSjh74c/6ZOHk7t+WO4RvrH09TDWl8 root@archlinux-packer (RSA)
+
+1024 MD5:7c:16:2b:05:9c:dd:27:5a:e5:a8:fd:02:0a:5a:b4:9b root@archlinux-packer (DSA)
+256 MD5:6a:55:6b:55:f2:d5:bb:60:25:33:91:a0:bd:a7:e0:07 root@archlinux-packer (ECDSA)
+256 MD5:a1:cc:9d:47:09:dc:25:78:9c:28:8e:5d:43:f0:29:89 root@archlinux-packer (ED25519)
+3072 MD5:09:8b:88:fc:d9:84:80:89:73:b1:be:81:48:e8:d9:f8 root@archlinux-packer (RSA)
+
 # homedir.archlinux.org
 1024 SHA256:3iibcYCSLNa+WeOM62/9p3MxJFvmm2qJVnLr2vNljV0 root@archlinux-packer (DSA)
 256 SHA256:j7PC/+H3R4buq32hZZjsoLumNlBJ+Qiw7IZSL7yjn+k root@archlinux-packer (ECDSA)
diff --git a/docs/ssh-known_hosts.txt b/docs/ssh-known_hosts.txt
index 373e8353..2275993c 100644
--- a/docs/ssh-known_hosts.txt
+++ b/docs/ssh-known_hosts.txt
@@ -63,6 +63,11 @@ gitlab.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbml
 gitlab.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHlEYgcEupuvacbGF90L0PK8ZwL605p2APY5CFHv+aTV
 gitlab.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxF7B0Ni51J11LQcCKcABLI1TJPAKgLKX391n+TVmyrdT0i6HVseJ3e5nEgjR1dionZgME1l3nBeAvVQLqw1EvztSBpAZewH9feyQhTmNDFjij5Q/xs9r00Wd0m4reHx9BdHPPjKhYM+H09vofmOlZt8yJVfH4ziQeA5+kLLdfwSp+152n9CSsLJw2lACT2eha4bvR+Qze3ufZBF4njRePb5fQTJVRgLcavqNky+WMlUPHpRuElX1Djfghj0OaK9TSkR9ij9jxvC836EDkLX/lPTgVDTP/oQYtlUrR9b6O+QAN/yHZmrFqQ8CADQuDuBF4xH6BxecJbjMfnryIdgXAz3CfoPfRS8zsIO6k9/Mmzx8rTeP18+ysq4yvhSmfsmYdkcNvOFNhYc8/4ViPghQQyR3GZEH3JU8cL1WR68iNomhR03WtttgXEuhWopFdWfYKu1AyPtbweFnLxarlJ2UEj80XL8iEoR60e+MsskaQNYnTJJaitwztaRn6q/Enr0U=
 
+# gluebuddy.archlinux.org
+gluebuddy.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIee6Gt+QO0+6MdJK0TQnHOuwkwmmUqHPIoIWZWrwT/0/YaYriU+SO3losnJt385kTCSJfpvWPVdjWB4LABeo04=
+gluebuddy.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINqSuWiT1xKGjsErjdQh3vmgK7+/okC4AqZ/MEM1y6+c
+gluebuddy.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzH+LzWrP9ajVt7H37U5EQRx7EAaOWa7HUmhG3iMkgZSTMBbcvt6CY+I2sRjrv5W31YFs/f8S8JakuJIjhoOaZ3hKFvYT4lkoSKYi4X83seSPhb2xCKlEn+nw0zqZJw6JhM3rPQq2WBoLF3+FSfIOmFxgVSEWZZwqN5tuqL2Idv/+m1RIDSfV5Facvos2YH9LpXLjs67KM9QElVTbCybYOZcM3GrE5OGOXsZmwQH2aPPRokUd7Lk8PNccZXGhXfF6nQlddCM/tBRRHhA4A4kGIceALqozeBMkRFGaWDc1hQW+AwdvYFsRVqy5GAPzGFzGKsRMgGmAQ4CzhuHRlb4GLa0BLsSxTCnH3zrta3apfzQgPpYpal3qD8Xcw9jJThjhKk1b/mKMhhUVWV9CncXPk0Lbl6SXc5iClde7MgPnOeKCvk5lnXOWZTy/R/4Q779Y7e4T4+MjL40m2DxZKbWrDv7MUuRgS8EIaDNlU6s8R67LIjFTKup47UXDORi8IPO0=
+
 # homedir.archlinux.org
 homedir.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP4Wb9DA2Ni2QyTnMXRKI52puuhyuVqxKGQ5xmk36Xxj4OeTlILXIwfQ8k/Ywovs1izNs+xqLMF7DqbE8sXChKY=
 homedir.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPxEHvFCXujU6s4eW0U79olHnNZta9WWC9SH/Nq6vTp0
diff --git a/host_vars/gluebuddy.archlinux.org/misc b/host_vars/gluebuddy.archlinux.org/misc
new file mode 100644
index 00000000..ca1d9755
--- /dev/null
+++ b/host_vars/gluebuddy.archlinux.org/misc
@@ -0,0 +1,2 @@
+---
+filesystem: btrfs
diff --git a/hosts b/hosts
index d9fbd61e..8234b007 100644
--- a/hosts
+++ b/hosts
@@ -45,6 +45,7 @@ patchwork.archlinux.org
 security.archlinux.org
 md.archlinux.org
 lists.archlinux.org
+gluebuddy.archlinux.org
 
 [borg_hosts]
 zh1905.rsync.net
diff --git a/playbooks/gluebuddy.archlinux.org.yml b/playbooks/gluebuddy.archlinux.org.yml
new file mode 100644
index 00000000..8d5b467e
--- /dev/null
+++ b/playbooks/gluebuddy.archlinux.org.yml
@@ -0,0 +1,16 @@
+---
+
+- name: setup gluebuddy.archlinux.org
+  hosts: gluebuddy.archlinux.org
+  remote_user: root
+  roles:
+    - { role: common }
+    - { role: tools }
+    - { role: firewalld }
+    - { role: sshd }
+    - { role: root_ssh }
+    - { role: gluebuddy }
+    - { role: borg_client, tags: ["borg"] }
+    - { role: prometheus_exporters }
+    - { role: promtail }
+    - { role: fail2ban }
diff --git a/tf-stage1/archlinux.tf b/tf-stage1/archlinux.tf
index ba4b1668..158cce21 100644
--- a/tf-stage1/archlinux.tf
+++ b/tf-stage1/archlinux.tf
@@ -143,6 +143,10 @@ locals {
     "md.archlinux.org" = {
       server_type = "cx11"
       domain      = "md"
+    },
+    "gluebuddy.archlinux.org" = {
+      server_type = "cx11"
+      domain      = "gluebuddy"
     }
   }