diff --git a/playbooks/serguzim.net.yml b/playbooks/serguzim.net.yml
index cdf969b..a568eb0 100644
--- a/playbooks/serguzim.net.yml
+++ b/playbooks/serguzim.net.yml
@@ -2,6 +2,14 @@
 - name: Run all roles
   hosts: serguzim_net
   tasks:
+    - name: Install software
+      ansible.builtin.include_role:
+        name: software
+        apply:
+          tags: software
+      tags: software
+      when: "inventory_hostname == 'node003'"
+
     - name: Include common roles
       ansible.builtin.include_role:
         name: "{{ services_item }}"
diff --git a/roles/gatus/vars/main.yml b/roles/gatus/vars/main.yml
index d98a723..df8b11c 100644
--- a/roles/gatus/vars/main.yml
+++ b/roles/gatus/vars/main.yml
@@ -9,9 +9,11 @@ gatus_external_endpoints_backups: "{{ vault_hosts | vault_hosts_backup_to_gatus(
 gatus_endpoints_hosts: "{{ opentofu.hosts | hosts_to_gatus() }}"
 gatus_endpoints_services: "{{ all_services | services_to_gatus() }}"
 
+gatus_federation_tester: "https://federationtester.matrix.org/api/report?server_name=msrg.cc"
+
 gatus_endpoints_other:
   - name: matrix-federation
-    url: https://federationtester.matrix.org/api/report?server_name=msrg.cc
+    url: "{{ gatus_federation_tester }}"
     group: 9-external
     interval: 5m
     conditions:
@@ -51,6 +53,11 @@ gatus_yml:
       client-secret: "{{ opentofu.authentik_data.gatus.client_secret }}"
       scopes: ["openid"]
 
+  ui:
+    buttons:
+      - name: Matrix Federation Tester
+        link: "{{ gatus_federation_tester }}"
+
   alerting:
     email: "{{ vault_gatus.alerting.email }}"
     ntfy: "{{ vault_gatus.alerting.ntfy }}"
diff --git a/roles/docker/tasks/main.yml b/roles/software/tasks/docker.yml
similarity index 90%
rename from roles/docker/tasks/main.yml
rename to roles/software/tasks/docker.yml
index 351facf..377d97a 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/software/tasks/docker.yml
@@ -1,10 +1,3 @@
-- name: Install aptitude
-  apt:
-    name: aptitude
-    state: latest
-    update_cache: true
-  become: true
-
 - name: Install required system packages
   apt:
     pkg:
diff --git a/roles/software/tasks/main.yml b/roles/software/tasks/main.yml
new file mode 100644
index 0000000..604a15c
--- /dev/null
+++ b/roles/software/tasks/main.yml
@@ -0,0 +1,17 @@
+- name: Install aptitude
+  apt:
+    name: aptitude
+    state: latest
+    update_cache: true
+  become: true
+
+- name: Install docker
+  ansible.builtin.import_tasks: docker.yml
+
+- name: Install jq
+  apt:
+    pkg:
+      - jq
+    state: latest
+    update_cache: true
+  become: true