diff --git a/roles/munin/tasks/main.yml b/roles/munin/tasks/main.yml
index 860cc0cc3..dd7570993 100644
--- a/roles/munin/tasks/main.yml
+++ b/roles/munin/tasks/main.yml
@@ -1,7 +1,22 @@
-- name: Install munin
+- name: Install Munin if it does not appear installed in {{ iiab_state_file }}    # /etc/iiab/iiab_state.yml
   include_tasks: install.yml
-  when: munin_install and not munin_installed is defined
+  when: not munin_installed is defined
 
-- name: Enable munin
-  include_tasks: enable.yml
-  when: munin_install or munin_installed is defined
+- name: Enable or Disable Munin
+  include_tasks: enable-or-disable.yml
+
+- 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 }}"