diff --git a/playbooks/all-hosts-basic.yml b/playbooks/all-hosts-basic.yml
index 7295e0a95e257a0e1558692f3ff15f425dcd1f27..e9e290487180beaa2bccf7b740cbcc0e44854390 100644
--- a/playbooks/all-hosts-basic.yml
+++ b/playbooks/all-hosts-basic.yml
@@ -12,5 +12,4 @@
     #- { role: sshd, tags: ['sshd'] }
     - { role: root_ssh }
     - { role: borg_client, tags: ["borg"], when: "'borg_clients' in group_names" }
-    - { role: zabbix_agent, tags: ["zabbix"], when: "'unmanaged' not in group_names" }
     - { role: hardening }
diff --git a/playbooks/archive-mirrors.yml b/playbooks/archive-mirrors.yml
index b23f8b68150a4b891d486224b2c375bd6c22a115..e1083d162c4948f2e7e047ea20773b14a4e7055e 100644
--- a/playbooks/archive-mirrors.yml
+++ b/playbooks/archive-mirrors.yml
@@ -11,5 +11,4 @@
     - { role: nginx }
     - { role: unbound }
     - { role: syncarchive, tags: ['nginx'] }
-    - { role: zabbix_agent, tags: ["zabbix"] }
     - { role: archive, archive_nginx_only: true, archive_dir: "/srv/archive"}
diff --git a/playbooks/gemini.archlinux.org.yml b/playbooks/gemini.archlinux.org.yml
index 4570bc1053481fe2a4738cfa1e4c3b8e3999a059..3ed59aba5085851aea725dc8e16662a5c8fb5356 100644
--- a/playbooks/gemini.archlinux.org.yml
+++ b/playbooks/gemini.archlinux.org.yml
@@ -14,7 +14,6 @@
     - { role: root_ssh }
     - { role: borg_client, tags: ['borg'] }
     - { role: sudo, tags: ['archusers'] }
-    - { role: zabbix_agent }
     - { role: certbot }
     - { role: nginx }
     - { role: dbscripts, repos_domain: "repos.archlinux.org", repos_rsync_domain: "rsync.archlinux.org", svntogit_repos: "/srv/svntogit/repos", postgres_ssl: 'on', tags: ['archusers'] }
diff --git a/playbooks/homedir.archlinux.org.yml b/playbooks/homedir.archlinux.org.yml
index fb965efe9981babdbf613f0a2f41ca88593d3c6a..0a03b52bcbe4cc1706a802b0510adf6a45c3172b 100644
--- a/playbooks/homedir.archlinux.org.yml
+++ b/playbooks/homedir.archlinux.org.yml
@@ -13,4 +13,3 @@
     - { role: archusers }
     - { role: public_html, public_domain: "pkgbuild.com", tags: ['nginx'] }
     - { role: borg_client, tags: ["borg"] }
-    - { role: zabbix_agent, tags: ["zabbix"] }
diff --git a/playbooks/luna.yml b/playbooks/luna.yml
index e3fe11fc8a44efb681730baf070d39aac67a190f..9b5fd6dd0d6d1650eb620200e92f649cba027698 100644
--- a/playbooks/luna.yml
+++ b/playbooks/luna.yml
@@ -7,7 +7,6 @@
     - name: open firewall holes for services
       firewalld: service={{ item }} permanent=true state=enabled immediate=yes
       with_items:
-        - zabbix_agent
         - http
         - https
         - rsyncd
diff --git a/playbooks/matrix.archlinux.org.yml b/playbooks/matrix.archlinux.org.yml
index 9545b41c911efd5cab082b69a4c810a1e3f8fe35..4ca26a74dcbff46e3ddc6a10bb3156cf12327fa4 100644
--- a/playbooks/matrix.archlinux.org.yml
+++ b/playbooks/matrix.archlinux.org.yml
@@ -21,5 +21,4 @@
     - role: postfix
       postfix_relayhost: "orion.archlinux.org"
     - { role: matrix }
-    - { role: zabbix_agent, tags: ["zabbix"] }
     - { role: fail2ban }
diff --git a/playbooks/mirrors.yml b/playbooks/mirrors.yml
index 96a8ccc810990a5f02cfc61d4bb0e6a2a485f4d8..6f8f0b44da48955a3092cc93284c6cd0162b8e29 100644
--- a/playbooks/mirrors.yml
+++ b/playbooks/mirrors.yml
@@ -12,5 +12,4 @@
     - { role: unbound }
     - { role: syncrepo, tags: ['nginx'] }
     - { role: archweb, archweb_site: false, archweb_services: false, archweb_mirrorcheck: true }
-    - { role: zabbix_agent, tags: ["zabbix"] }
     - { role: arch32_mirror, tags: ['nginx'] }
diff --git a/playbooks/state.archlinux.org.yml b/playbooks/state.archlinux.org.yml
index 2937cd362f6433e3fe473c95e37c0309567f7566..0353d8f7842c6974e82056bc65f672fb99d56194 100644
--- a/playbooks/state.archlinux.org.yml
+++ b/playbooks/state.archlinux.org.yml
@@ -11,7 +11,6 @@
     - { role: unbound }
     - { role: certbot }
     - { role: borg_client, tags: ["borg"] }
-    - { role: zabbix_agent, tags: ["zabbix"] }
     - { role: root_ssh }
     - role: postgres
       postgres_listen_addresses: "*"