diff --git a/roles/azuracast/tasks/install.yml b/roles/azuracast/tasks/install.yml
index 954154bcd..3fe7808e5 100644
--- a/roles/azuracast/tasks/install.yml
+++ b/roles/azuracast/tasks/install.yml
@@ -64,7 +64,7 @@
   args:
     chdir: "{{ azuracast_host_dir }}"
 
-- name: Add 'azuracast_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'azuracast_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^azuracast_installed'
diff --git a/roles/bluetooth/tasks/install.yml b/roles/bluetooth/tasks/install.yml
index e60d2cc6e..b9f7b4e91 100644
--- a/roles/bluetooth/tasks/install.yml
+++ b/roles/bluetooth/tasks/install.yml
@@ -55,7 +55,7 @@
     regexp: '^#DiscoverableTimeout'
     line: 'DiscoverableTimeout = 0'
 
-- name: Add 'bluetooth_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'bluetooth_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^bluetooth_installed'
diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml
index eadd5cb88..4a29c3ec5 100644
--- a/roles/calibre-web/tasks/install.yml
+++ b/roles/calibre-web/tasks/install.yml
@@ -102,7 +102,7 @@
   when: not metadatadb.stat.exists
   #when: calibreweb_provision | bool
 
-- name: Add 'calibreweb_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'calibreweb_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^calibreweb_installed'
diff --git a/roles/calibre/tasks/install.yml b/roles/calibre/tasks/install.yml
index fa500f060..08f607214 100644
--- a/roles/calibre/tasks/install.yml
+++ b/roles/calibre/tasks/install.yml
@@ -79,7 +79,7 @@
   include_tasks: create-db.yml
   when: not calibre_db.stat.exists
 
-- name: Add 'calibre_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'calibre_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^calibreweb_installed'
diff --git a/roles/captiveportal/tasks/main.yml b/roles/captiveportal/tasks/main.yml
index 30c84f477..3b0c34fed 100644
--- a/roles/captiveportal/tasks/main.yml
+++ b/roles/captiveportal/tasks/main.yml
@@ -88,7 +88,7 @@
     state: absent
   when: not captiveportal_enabled
 
-- name: Add 'captiveportal_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'captiveportal_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^captiveportal_installed'
diff --git a/roles/cups/tasks/main.yml b/roles/cups/tasks/main.yml
index 0bd48e6c1..0d035f802 100644
--- a/roles/cups/tasks/main.yml
+++ b/roles/cups/tasks/main.yml
@@ -7,7 +7,7 @@
   tags:
     - download
 
-- name: Add 'cups_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'cups_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^cups_installed'
diff --git a/roles/dokuwiki/tasks/install.yml b/roles/dokuwiki/tasks/install.yml
index a23e3b494..eb75aa8ef 100644
--- a/roles/dokuwiki/tasks/install.yml
+++ b/roles/dokuwiki/tasks/install.yml
@@ -48,7 +48,7 @@
     state: directory
     recurse: yes
 
-- name: Add 'dokuwiki_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'dokuwiki_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^dokuwiki_installed'
diff --git a/roles/elgg/tasks/install.yml b/roles/elgg/tasks/install.yml
index d064846f5..e2ff1c872 100644
--- a/roles/elgg/tasks/install.yml
+++ b/roles/elgg/tasks/install.yml
@@ -87,7 +87,7 @@
     src: elgg.conf
     dest: "/etc/{{ apache_config_dir }}/elgg.conf"
 
-- name: Add 'elgg_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'elgg_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^elgg_installed'
diff --git a/roles/gitea/tasks/install.yml b/roles/gitea/tasks/install.yml
index 19274accb..90a99b8cc 100644
--- a/roles/gitea/tasks/install.yml
+++ b/roles/gitea/tasks/install.yml
@@ -124,7 +124,7 @@
     - { src: 'gitea.service.j2', dest: '/etc/systemd/system/gitea.service' }
     - { src: 'gitea.conf.j2', dest: "/etc/{{ apache_config_dir }}/gitea.conf" }
 
-- name: "Add 'gitea_installed: True' to {{ iiab_state_file }}"
+- name: "Add 'gitea_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^gitea_installed'
diff --git a/roles/internetarchive/tasks/install.yml b/roles/internetarchive/tasks/install.yml
index ba5cfa237..97e42e6eb 100644
--- a/roles/internetarchive/tasks/install.yml
+++ b/roles/internetarchive/tasks/install.yml
@@ -45,7 +45,7 @@
     - { src: 'internetarchive.service.j2', dest: '/etc/systemd/system/internetarchive.service' }
     - { src: 'internetarchive.conf', dest: '/etc/apache2/sites-available/internetarchive.conf' }
 
-- name: Add 'internetarchive_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'internetarchive_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^internetarchive_installed'
diff --git a/roles/kalite/tasks/setup.yml b/roles/kalite/tasks/setup.yml
index b9ce96a52..6807a79b1 100644
--- a/roles/kalite/tasks/setup.yml
+++ b/roles/kalite/tasks/setup.yml
@@ -15,7 +15,7 @@
   async: 1800
   poll: 10
 
-- name: Add 'kalite_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'kalite_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^kalite_installed'
diff --git a/roles/kiwix/tasks/kiwix_enable.yml b/roles/kiwix/tasks/enable.yml
similarity index 100%
rename from roles/kiwix/tasks/kiwix_enable.yml
rename to roles/kiwix/tasks/enable.yml
diff --git a/roles/kiwix/tasks/install.yml b/roles/kiwix/tasks/install.yml
index e7b08df3b..60ecd1a95 100644
--- a/roles/kiwix/tasks/install.yml
+++ b/roles/kiwix/tasks/install.yml
@@ -83,7 +83,7 @@
 
 # 5. RECORD KIWIX AS INSTALLED IN /etc/iiab/iiab_state.yml
 
-- name: "Add 'kiwix_installed: True' to {{ iiab_state_file }}"
+- name: "Add 'kiwix_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^kiwix_installed'
diff --git a/roles/kolibri/tasks/install.yml b/roles/kolibri/tasks/install.yml
index 59e2174a3..d2f40ddab 100644
--- a/roles/kolibri/tasks/install.yml
+++ b/roles/kolibri/tasks/install.yml
@@ -113,7 +113,7 @@
 #  apache2_module:
 #    name: proxy_http
 
-- name: Add 'kolibri_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'kolibri_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^kolibri_installed'
diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml
index d531177c0..896ac8486 100644
--- a/roles/lokole/tasks/install.yml
+++ b/roles/lokole/tasks/install.yml
@@ -98,7 +98,7 @@
     state: restarted
   when: lokole_enabled | bool
 
-- name: Add 'lokole_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'lokole_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^lokole_installed'
diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml
index 0ab0acbff..4e4aed023 100644
--- a/roles/mediawiki/tasks/install.yml
+++ b/roles/mediawiki/tasks/install.yml
@@ -85,7 +85,7 @@
 
 # Install {{ nginx_config_dir }}/mediawiki-nginx.conf from template in enable.yml
 
-- name: Add 'mediawiki_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'mediawiki_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^mediawiki_installed'
diff --git a/roles/minetest/tasks/provision.yml b/roles/minetest/tasks/provision.yml
index ea34c1779..86241b18e 100644
--- a/roles/minetest/tasks/provision.yml
+++ b/roles/minetest/tasks/provision.yml
@@ -71,7 +71,7 @@
     path: "{{ minetest_game_dir }}/mods/name_restrictions"
   when: minetest_default_game == "carbone-ng"
 
-- name: Add 'minetest_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'minetest_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^minetest_installed'
diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml
index 2268ac82e..0708e78a6 100644
--- a/roles/mongodb/tasks/install.yml
+++ b/roles/mongodb/tasks/install.yml
@@ -128,7 +128,7 @@
     - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/mongodb.service', mode: '0644' }
     - { src: 'iiab-mongodb-repair-if-no-lock.j2', dest: '/usr/bin/iiab-mongodb-repair-if-no-lock', mode: '0755' }
 
-- name: Add 'mongodb_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'mongodb_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^mongodb_installed'
diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml
index 036867eb1..c41607c54 100644
--- a/roles/moodle/tasks/install.yml
+++ b/roles/moodle/tasks/install.yml
@@ -138,7 +138,7 @@
     path: "{{ moodle_base }}/config.php"
     mode: 0644
 
-- name: Add 'moodle_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'moodle_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^moodle_installed'
diff --git a/roles/mosquitto/tasks/install.yml b/roles/mosquitto/tasks/install.yml
index c7edfad69..5638a52f2 100644
--- a/roles/mosquitto/tasks/install.yml
+++ b/roles/mosquitto/tasks/install.yml
@@ -30,7 +30,7 @@
     group: root
     mode: 0755
 
-- name: Add 'mosquitto_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'mosquitto_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^mosquitto_installed'
diff --git a/roles/munin/tasks/install.yml b/roles/munin/tasks/install.yml
index cc6f0e254..36b52e00b 100644
--- a/roles/munin/tasks/install.yml
+++ b/roles/munin/tasks/install.yml
@@ -40,7 +40,7 @@
     create: yes
     state: present
 
-- name: Add 'munin_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'munin_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^munin_installed'
diff --git a/roles/network/tasks/dansguardian.yml b/roles/network/tasks/dansguardian.yml
index 9b593d2a0..a198b79b0 100644
--- a/roles/network/tasks/dansguardian.yml
+++ b/roles/network/tasks/dansguardian.yml
@@ -50,7 +50,7 @@
     state: directory
   when: ansible_distribution == "CentOS"
 
-- name: Add 'dansguardian_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'dansguardian_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^dansguardian_installed'
diff --git a/roles/network/tasks/dhcpd.yml b/roles/network/tasks/dhcpd.yml
index 6347cd4e7..7ac500af0 100644
--- a/roles/network/tasks/dhcpd.yml
+++ b/roles/network/tasks/dhcpd.yml
@@ -60,7 +60,7 @@
     state: file
   when: is_redhat | bool
 
-- name: Add 'dhcpd_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'dhcpd_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^dhcpd_installed'
diff --git a/roles/network/tasks/named.yml b/roles/network/tasks/named.yml
index 965aa5cdf..4718e4ecd 100644
--- a/roles/network/tasks/named.yml
+++ b/roles/network/tasks/named.yml
@@ -100,7 +100,7 @@
     state: absent
   when: not is_debuntu and not dns_jail_enabled
 
-- name: Add 'named_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'named_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^named_installed'
diff --git a/roles/network/tasks/squid.yml b/roles/network/tasks/squid.yml
index efef305af..fd798977e 100644
--- a/roles/network/tasks/squid.yml
+++ b/roles/network/tasks/squid.yml
@@ -82,7 +82,7 @@
 - include_tasks: roles/network/tasks/dansguardian.yml
   when: dansguardian_install | bool
 
-- name: Add 'squid_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'squid_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^squid_installed'
diff --git a/roles/network/tasks/wondershaper.yml b/roles/network/tasks/wondershaper.yml
index 4b84b0cf0..8a61fd578 100644
--- a/roles/network/tasks/wondershaper.yml
+++ b/roles/network/tasks/wondershaper.yml
@@ -38,7 +38,7 @@
     group: root
     state: link
 
-- name: Add 'wondershaper_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'wondershaper_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^wondershaper_installed'
diff --git a/roles/nextcloud/tasks/install.yml b/roles/nextcloud/tasks/install.yml
index 99f35c73e..0c6dd658a 100644
--- a/roles/nextcloud/tasks/install.yml
+++ b/roles/nextcloud/tasks/install.yml
@@ -182,7 +182,7 @@
     group: root
     mode: 0644
 
-- name: Add 'nextcloud_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'nextcloud_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^nextcloud_installed'
diff --git a/roles/nodered/tasks/install.yml b/roles/nodered/tasks/install.yml
index 7e5365d0f..490c2171e 100644
--- a/roles/nodered/tasks/install.yml
+++ b/roles/nodered/tasks/install.yml
@@ -97,7 +97,7 @@
     state: present
     name: proxy_wstunnel
 
-- name: Add 'nodered_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'nodered_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^nodered_installed'
diff --git a/roles/samba/tasks/main.yml b/roles/samba/tasks/main.yml
index a8060d5ca..33e07b817 100755
--- a/roles/samba/tasks/main.yml
+++ b/roles/samba/tasks/main.yml
@@ -30,7 +30,7 @@
     src: smb.conf.j2
     dest: /etc/samba/smb.conf
 
-- name: Add 'samba_installed' variable values to {{ iiab_state_file }}
+- name: "Add 'samba_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^samba_installed'
diff --git a/roles/sugarizer/tasks/install.yml b/roles/sugarizer/tasks/install.yml
index c60561aad..9ebfbb1ec 100644
--- a/roles/sugarizer/tasks/install.yml
+++ b/roles/sugarizer/tasks/install.yml
@@ -215,7 +215,7 @@
 #    # Use this instead, if tabs are truly nec:
 #    # block: "\tvar pathPrefix = '/sugarizer';\n\tapp.use(pathPrefix, require('path-prefix-proxy')(pathPrefix));"
 
-- name: "Add 'sugarizer_installed: True' to {{ iiab_state_file }}"
+- name: "Add 'sugarizer_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^sugarizer_installed'
diff --git a/roles/wordpress/tasks/install.yml b/roles/wordpress/tasks/install.yml
index 629edf133..096b927b2 100644
--- a/roles/wordpress/tasks/install.yml
+++ b/roles/wordpress/tasks/install.yml
@@ -90,7 +90,7 @@
     dest: "/etc/{{ apache_config_dir }}/wordpress.conf"
   when: apache_enabled | bool
 
-- name: "Add 'wordpress_installed: True' to {{ iiab_state_file }}"
+- name: "Add 'wordpress_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
   lineinfile:
     dest: "{{ iiab_state_file }}"
     regexp: '^wordpress_installed'