diff --git a/zabbix-agent/tasks/main.yml b/zabbix-agent/tasks/main.yml
index 73431b40d6493503783e98f9bd22df2d749f3343..c28c3b9e2330e6adc34d6a95ba1aa5ec6c4c593a 100644
--- a/zabbix-agent/tasks/main.yml
+++ b/zabbix-agent/tasks/main.yml
@@ -8,7 +8,6 @@
     - packages
     - zabbix
 
-# TODO
 - name: ensure the agent is configured
   template: src=zabbix_agentd.conf.j2 dest=/etc/zabbix/zabbix_agentd.conf
   notify:
@@ -22,7 +21,6 @@
 #  tags:
 #    - service
 #    - zabbix
-# TODO e.g. disk i/o, smart, cups, ...
 
 - name: ensure the server is enabled and running
   service: name=zabbix-agent state=running enabled=yes
@@ -30,12 +28,15 @@
     - service
     - zabbix
 
-# unfortunately this packages is totaly useless because of some ubuntu specific dependencies
-- name: install debian update checks
-  apt: update_cache=yes  name=zabbix-check-dpkg state=latest
+- name: ensure zabbix-smart-check is installed
+  apt: name={{ item }} state=present
+  with_items:
+    - zabbix-check-smart
+    - zabbix-check-disk-performance
+  when: "'baremetal' in group_names"
   tags:
-    - zabbix
     - packages
+    - hardware-tools
     - chr
 
 - meta: flush_handlers