diff --git a/roles/mgrote_munin_server/tasks/main.yml b/roles/mgrote_munin_server/tasks/main.yml
index 21feefc9..6f6f2091 100644
--- a/roles/mgrote_munin_server/tasks/main.yml
+++ b/roles/mgrote_munin_server/tasks/main.yml
@@ -17,13 +17,17 @@
       mode: '0755'
       owner: munin
       group: munin
+    - name: /var/lib/munin-node/plugin-state
+      mode: '0775'
+      owner: munin
+      group: munin
     - name: /etc/munin/plugins
       mode: '0755'
       owner: munin
       group: munin
     - name: /var/cache/munin/www
       mode: '0755'
-      owner: www-data
+      owner: munin
       group: root
     - name: /var/lib/munin
       mode: '0755'