diff --git a/.gitmodules b/.gitmodules
index 2ecd3334..79bbd96b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "roles/mosh"]
 	path = ansible/roles/mosh
 	url = git@github.com:void-ansible-roles/mosh.git
-[submodule "ansible/roles/mdbook"]
-	path = ansible/roles/mdbook
-	url = git@github.com:void-ansible-roles/mdbook.git
 [submodule "ansible/roles/node_exporter"]
         path = ansible/roles/node_exporter
         url = git@github.com:void-ansible-roles/node_exporter.git
diff --git a/ansible/build.yml b/ansible/build.yml
index 3f024c47..1fb05677 100644
--- a/ansible/build.yml
+++ b/ansible/build.yml
@@ -6,8 +6,6 @@
   roles:
     - acmetool
     - buildmaster
-    - void-updates
-    - xq-api
 
 - hosts: buildslave
   become: yes
diff --git a/ansible/docs.yml b/ansible/docs.yml
deleted file mode 100644
index 6cabe62e..00000000
--- a/ansible/docs.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: docs
-  become: yes
-  become_method: sudo
-  become_user: root
-  roles:
-    - acmetool
-    - nginx
-    - mdbook
diff --git a/ansible/host_vars/a-hel-fi.m.voidlinux.org.yml b/ansible/host_vars/a-hel-fi.m.voidlinux.org.yml
index be062969..c549663f 100644
--- a/ansible/host_vars/a-hel-fi.m.voidlinux.org.yml
+++ b/ansible/host_vars/a-hel-fi.m.voidlinux.org.yml
@@ -26,12 +26,6 @@ nginx_dhparam_bits: 2048
 buildmaster_ssl_cert_path: /var/lib/acme/live/build.voidlinux.org/fullchain
 buildmaster_ssl_certkey_path: /var/lib/acme/live/build.voidlinux.org/privkey
 
-xqapi_site_cert_path: /var/lib/acme/live/xq-api.voidlinux.org/fullchain
-xqapi_site_key_path: /var/lib/acme/live/xq-api.voidlinux.org/privkey
-
-man_cert_path: /var/lib/acme/live/man.voidlinux.org/fullchain
-man_key_path: /var/lib/acme/live/man.voidlinux.org/privkey
-
 buildslave_zone: FI-1
 buildslave_master: localhost
 
@@ -46,31 +40,10 @@ acmetool:
     - site: build.voidlinux.org
       names:
         - build.voidlinux.org
-    - site: xq-api.voidlinux.org
-      names:
-        - xq-api.voidlinux.org
-    - site: docs.voidlinux.org
-      names:
-        - docs.voidlinux.org
   hostmaster_email: postmaster@voidlinux.org
   services:
     - nginx
 
-mdbook_sites:
-  - name: docs
-    root_path: /srv/www/void-repo/docs
-    urls:
-      - docs.voidlinux.org
-    source_url: https://github.com/void-linux/void-docs
-    source_port: 443
-    tls:
-      certificate: /var/lib/acme/live/docs.voidlinux.org/fullchain
-      key: /var/lib/acme/live/docs.voidlinux.org/privkey
-      stapling: true
-
-xqapi:
-  repodata: /mnt/data/pkgs/binpkgs
-
 nomad_host_volumes:
   - name: terrastate
     path: /nomad/terrastate
diff --git a/ansible/inventory b/ansible/inventory
index 43a114c4..374bcf30 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -13,9 +13,6 @@ buildslave
 [root_mirror]
 a-fsn-de.m.voidlinux.org
 
-[docs]
-a-hel-fi.m.voidlinux.org
-
 [popcorn]
 a-hel-fi.m.voidlinux.org
 
diff --git a/ansible/roles/mdbook b/ansible/roles/mdbook
deleted file mode 160000
index 54830c5a..00000000
--- a/ansible/roles/mdbook
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 54830c5a80ce2f0413ef719e6c449a29b7de69f0
diff --git a/ansible/roles/mirror-base/tasks/main.yml b/ansible/roles/mirror-base/tasks/main.yml
deleted file mode 100644
index 8dc47176..00000000
--- a/ansible/roles/mirror-base/tasks/main.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: Create the reposync group
-  group:
-    name: reposync
-    state: present
-    system: yes
-
-- name: Create the reposync user
-  user:
-    name: reposync
-    state: present
-    group: reposync
-    system: yes
diff --git a/ansible/roles/void-updates/defaults/main.yml b/ansible/roles/void-updates/defaults/main.yml
deleted file mode 100644
index 75a085e9..00000000
--- a/ansible/roles/void-updates/defaults/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-void_updates_user: voidupdates
-void_updates_homedir: /var/cache/void-updates
-void_updates_srvdir: /srv/www/void-repo/
diff --git a/ansible/roles/void-updates/meta/main.yml b/ansible/roles/void-updates/meta/main.yml
deleted file mode 100644
index 1b3d90f7..00000000
--- a/ansible/roles/void-updates/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-  - { role: crond }
diff --git a/ansible/roles/void-updates/tasks/main.yml b/ansible/roles/void-updates/tasks/main.yml
deleted file mode 100644
index cf42f0dd..00000000
--- a/ansible/roles/void-updates/tasks/main.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- name: Install void-updates
-  xbps:
-    pkg: void-updates
-    state: present
-
-- name: Create the {{ void_updates_user }} user
-  user:
-    name: "{{ void_updates_user }}"
-    state: present
-    groups: "xbuilder"
-    system: yes
-    createhome: yes
-    home: "{{ void_updates_homedir }}"
-
-- name: Install Update Check Cron Job
-  template:
-    src: void_updates.j2
-    dest: /etc/cron.d/void_updates
-    owner: root
-    group: root
-    mode: 0644
-
-- name: Mount the results into the mirror
-  mount:
-    fstype: none
-    src: /var/cache/void-updates/result
-    path: /srv/www/void-repo/void-updates
-    state: mounted
-    opts: defaults,bind,ro
diff --git a/ansible/roles/void-updates/templates/void_updates.j2 b/ansible/roles/void-updates/templates/void_updates.j2
deleted file mode 100644
index 5fecf1fd..00000000
--- a/ansible/roles/void-updates/templates/void_updates.j2
+++ /dev/null
@@ -1 +0,0 @@
-0 4 * * * {{ void_updates_user }} /usr/bin/void-updates -p 20 -r https://github.com/void-linux/void-packages.git -s {{ void_updates_homedir }}/src -o {{ void_updates_homedir }}/result
diff --git a/ansible/roles/xq-api/defaults/main.yml b/ansible/roles/xq-api/defaults/main.yml
deleted file mode 100644
index 33ee4c74..00000000
--- a/ansible/roles/xq-api/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-xqapi:
-xqapi_hup:
diff --git a/ansible/roles/xq-api/files/root.conf b/ansible/roles/xq-api/files/root.conf
deleted file mode 100644
index 3dc1f24b..00000000
--- a/ansible/roles/xq-api/files/root.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-location / {
-    proxy_pass http://localhost:8197;
-}
diff --git a/ansible/roles/xq-api/handlers/main.yml b/ansible/roles/xq-api/handlers/main.yml
deleted file mode 100644
index 2c53941e..00000000
--- a/ansible/roles/xq-api/handlers/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: xq-api
-  runit:
-    name: xq-api
-    state: restarted
-
-- name: xq-api-hup
-  runit:
-    name: xq-api-hup
-    state: restarted
diff --git a/ansible/roles/xq-api/meta/main.yml b/ansible/roles/xq-api/meta/main.yml
deleted file mode 100644
index e3d1763b..00000000
--- a/ansible/roles/xq-api/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-  - { role: nginx }
diff --git a/ansible/roles/xq-api/tasks/main.yml b/ansible/roles/xq-api/tasks/main.yml
deleted file mode 100644
index 65dcd66f..00000000
--- a/ansible/roles/xq-api/tasks/main.yml
+++ /dev/null
@@ -1,76 +0,0 @@
----
-- name: Install packages
-  xbps:
-    pkg:
-      - xq-api
-      - snooze
-    state: present
-
-- name: Configure xq-api
-  template:
-    src: xq-api.conf.j2
-    dest: /etc/sv/xq-api/conf
-    owner: root
-    group: root
-    mode: 0644
-  notify:
-    - xq-api
-
-- name: Install xq-api HUP service (1/2)
-  file:
-    path: /etc/sv/xq-api-hup
-    state: directory
-    owner: root
-    group: root
-    mode: 0755
-
-- name: Install xq-api HUP service (2/2)
-  template:
-    src: xq-api-hup.sh.j2
-    dest: /etc/sv/xq-api-hup/run
-    owner: root
-    group: root
-    mode: 0755
-  notify:
-    - xq-api-hup
-
-- name: Create xq-api log directory
-  file:
-    path: /var/log/xq-api
-    state: directory
-    owner: _xqapi
-    group: _xqapi
-    mode: 0755
-
-- name: Enable services
-  runit:
-    name: "{{ item }}"
-    enabled: yes
-  loop:
-    - xq-api
-    - xq-api-hup
-
-- name: Configure nginx base-site
-  include_role:
-    name: nginx
-    tasks_from: base-site
-  vars:
-    - site:
-        name: xq-api
-        urls:
-          - xq-api.voidlinux.org
-        static_root: no
-        tls:
-          certificate: "{{ xqapi_site_cert_path | default('/dev/null') }}"
-          key: "{{ xqapi_site_key_path | default('/dev/null') }}"
-          stapling: yes
-
-- name: Install location file
-  copy:
-    src: root.conf
-    dest: /etc/nginx/locations.d/xq-api.voidlinux.org/
-    owner: root
-    group: root
-    mode: 0644
-  notify:
-    - nginx
diff --git a/ansible/roles/xq-api/templates/xq-api-hup.sh.j2 b/ansible/roles/xq-api/templates/xq-api-hup.sh.j2
deleted file mode 100644
index 7b626662..00000000
--- a/ansible/roles/xq-api/templates/xq-api-hup.sh.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec snooze -H {{ xqapi_hup.hour | default('*') | quote }} -M {{ xqapi_hup.minute | default('/5') | quote }} /usr/bin/sv hup xq-api
diff --git a/ansible/roles/xq-api/templates/xq-api.conf.j2 b/ansible/roles/xq-api/templates/xq-api.conf.j2
deleted file mode 100644
index 06e2ec2c..00000000
--- a/ansible/roles/xq-api/templates/xq-api.conf.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-NET={{ xqapi.listen_net | default('tcp') }}
-ADDR={{ xqapi.listen_addr | default('127.0.0.1:8197') }}
-MAX_QUERIES={{ xqapi.max_queries | default(16) }}
-LOG_V={{ xqapi.log_v | default(None) }}
-LOG_ACCESS={{ 't' if (xqapi.log_access | default(False)) else 'f' }}
-LOG_TO_STDERR={{ 't' if (xqapi.log_to_stderr | default(False)) else 'f' }}
-LOG_DIR={{ xqapi.log_dir | default(None) }}
-REPODATA={{ xqapi.repodata | default('/var/db/xbps') }}