diff --git a/roles/kiwix/tasks/enable-or-disable.yml b/roles/kiwix/tasks/enable-or-disable.yml
index f74c7cc6c..97cff1dc4 100644
--- a/roles/kiwix/tasks/enable-or-disable.yml
+++ b/roles/kiwix/tasks/enable-or-disable.yml
@@ -1,18 +1,20 @@
-- name: Enable & Restart 'kiwix-serve' systemd service
-  systemd:
-    name: kiwix-serve
-    daemon_reload: yes
-    enabled: yes
-    state: restarted
-  when: kiwix_enabled
-
 - name: Disable & Stop 'kiwix-serve' systemd service
   systemd:
     name: kiwix-serve
     enabled: no
     state: stopped
-  when: not kiwix_enabled
 
+- name: Update '{{ kiwix_library_xml }}'
+    command: /usr/bin/iiab-make-kiwix-lib
+  when: kiwix_enabled
+# the above starts the service
+
+- name: Enable & Ensure 'kiwix-serve' systemd service is started
+  systemd:
+    name: kiwix-serve
+    enabled: yes
+    state: started
+  when: kiwix_enabled
 
 # TO DO: BOTH CRON ENTRIES BELOW *SHOULD* BE DELETED "when: not kiwix_enabled"
 
diff --git a/roles/kiwix/tasks/install.yml b/roles/kiwix/tasks/install.yml
index d5b87daff..ed0aba237 100644
--- a/roles/kiwix/tasks/install.yml
+++ b/roles/kiwix/tasks/install.yml
@@ -107,6 +107,10 @@
     - { src: 'iiab-make-kiwix-lib', dest: '/usr/bin/iiab-make-kiwix-lib', mode: '0755' }
     - { src: 'iiab-make-kiwix-lib3.py', dest: '/usr/bin/iiab-make-kiwix-lib.py', mode: '0755' }
 
+- name: Reload systemd for new kiwix-serve.service file
+  systemd:
+    daemon_reload: yes
+
 - name: "Install from template: Apache's kiwix.conf"
   template:
     src: kiwix.conf.j2