diff --git a/group_vars/zabbix-server.yml b/group_vars/zabbix-server.yml
new file mode 100644
index 0000000..d94160c
--- /dev/null
+++ b/group_vars/zabbix-server.yml
@@ -0,0 +1,6 @@
+pg_hba_extra:
+- type: local
+  database: zabbix
+  user: zabbix
+  address: ''
+  method: md5
diff --git a/hosts b/hosts
index d1f0ee2..18e505f 100644
--- a/hosts
+++ b/hosts
@@ -34,3 +34,13 @@ cm0.pyrocufflink.blue
 
 [ansible]
 cm0.pyrocufflink.blue
+
+[zabbix-server]
+
+[postgresql:children]
+zabbix-server
+
+[zabbix]
+
+[zabbix:children]
+zabbix-server
diff --git a/zabbix-agent.yml b/zabbix-agent.yml
new file mode 100644
index 0000000..cffaa5b
--- /dev/null
+++ b/zabbix-agent.yml
@@ -0,0 +1,3 @@
+- hosts: zabbix
+  roles:
+  - zabbix-agent
diff --git a/zabbix-server.yml b/zabbix-server.yml
new file mode 100644
index 0000000..1fbd7c3
--- /dev/null
+++ b/zabbix-server.yml
@@ -0,0 +1,3 @@
+- hosts: zabbix-server
+  roles:
+  - zabbix-server
diff --git a/zabbix.yml b/zabbix.yml
new file mode 100644
index 0000000..ddcbea5
--- /dev/null
+++ b/zabbix.yml
@@ -0,0 +1,3 @@
+- import_playbook: postgresql.yml
+- import_playbook: zabbix-server.yml
+- import_playbook: zabbix-agent.yml