diff --git a/roles/munin-server/tasks/main.yml b/roles/munin-server/tasks/main.yml
index fc6a41b..c6780d7 100644
--- a/roles/munin-server/tasks/main.yml
+++ b/roles/munin-server/tasks/main.yml
@@ -64,6 +64,14 @@
     owner: root
     group: "{{ ansible_wheel }}"
 
+- name: create host config
+  template:
+    dest: /etc/munin/conf.d/hosts.conf
+    src: hosts.conf.j2
+    mode: 0644
+    owner: root
+    group: "{{ ansible_wheel }}"
+
 - name: create override config
   copy:
     dest: /etc/munin/conf.d/00-override.conf
diff --git a/roles/munin-server/templates/hosts.conf.j2 b/roles/munin-server/templates/hosts.conf.j2
new file mode 100644
index 0000000..5c33e39
--- /dev/null
+++ b/roles/munin-server/templates/hosts.conf.j2
@@ -0,0 +1,5 @@
+{% for host in groups["all"] %}
+[{{ host }}]
+  address {{ host }}
+  use_node_name yes
+{% endfor %}