diff --git a/group_vars/munin.yml b/group_vars/munin.yml
index 83388801..6fbfc29d 100644
--- a/group_vars/munin.yml
+++ b/group_vars/munin.yml
@@ -42,7 +42,7 @@ munin_node_bind_port: "4949"
 munin_node_allowed_cidrs: [127.0.0.1]
 
 ###  mgrote_munin_master
-munin_mode: cron # or cgi
+munin_mode: cgi # or cron
 munin_mail_user: munin@mgrote.net
 munin_mail_server: "{{ postfix_smtp_server }}"
 munin_mail_port: "{{ 1025 }}"
diff --git a/roles/mgrote_munin_server/tasks/main.yml b/roles/mgrote_munin_server/tasks/main.yml
index 0ae1e90a..5577990a 100644
--- a/roles/mgrote_munin_server/tasks/main.yml
+++ b/roles/mgrote_munin_server/tasks/main.yml
@@ -12,7 +12,27 @@
     mode: '0755'
     owner: munin
     group: munin
-  loop: "{{ munin_dirs }}"
+  loop:
+    - name: /var/run/munin
+      mode: '0755'
+      owner: root
+      group: root
+    - name: /etc/munin/plugins
+      mode: '0755'
+      owner: root
+      group: root
+    - name: /var/cache/munin/www
+      mode: '0755'
+      owner: root
+      group: root
+    - name: /var/lib/munin
+      mode: '0755'
+      owner: root
+      group: root
+    - name: /var/cache/munin
+      mode: '0755'
+      owner: root
+      group: root
 
 - name: Ensure permissions are set
   ansible.builtin.file: