diff --git a/roles/munin/tasks/enable.yml b/roles/munin/tasks/enable-or-disable.yml
similarity index 67%
rename from roles/munin/tasks/enable.yml
rename to roles/munin/tasks/enable-or-disable.yml
index 81420cbcb..ad19227d2 100644
--- a/roles/munin/tasks/enable.yml
+++ b/roles/munin/tasks/enable-or-disable.yml
@@ -27,7 +27,7 @@
   systemd:
     name: "{{ apache_service }}"    # apache2 or httpd, as set in /opt/iiab/iiab/vars/<OS>.yml
     state: restarted
-  when: apache_enabled | bool
+  when: apache_install and apache_enabled
 
 # NGINX
 
@@ -35,7 +35,7 @@
   template:
     src: munin24-nginx.conf.j2
     dest: "{{ nginx_config_dir }}/munin24-nginx.conf"    # /etc/nginx/conf.d
-  when: munin_enabled and nginx_enabled
+  when: munin_enabled    # and nginx_enabled
 
 - name: Disable http://box/munin via NGINX, by installing {{ nginx_config_dir }}/munin24-nginx.conf
   file:
@@ -47,21 +47,4 @@
   systemd:
     name: nginx
     state: restarted
-  when: nginx_enabled | bool
-
-
-- name: Add 'munin' variable values to {{ iiab_ini_file }}
-  ini_file:
-    path: "{{ iiab_ini_file }}"
-    section: munin
-    option: "{{ item.option }}"
-    value: "{{ item.value | string }}"
-  with_items:
-    - option: name
-      value: Munin
-    - option: description
-      value: '"Munin is a networked resource monitoring tool that can help analyze resource trends and ''what just happened to kill our performance?'' problems."'
-    - option: installed
-      value: "{{ munin_install }}"
-    - option: enabled
-      value: "{{ munin_enabled }}"
+  # when: nginx_enabled | bool