diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml
index 0bd2fa5a6..ae842d393 100644
--- a/roles/mongodb/tasks/main.yml
+++ b/roles/mongodb/tasks/main.yml
@@ -16,10 +16,10 @@
     owner: mongodb
   with_items:
     - { path: '/var/run/mongodb' }
-    - { path: "{{ mongodb_db_path }}" }
+    - { path: "{{ mongodb_db_path }}" }    # == /library/dbdata/mongodb/
     - { path: '/var/log/mongodb' }
 
-- name: Populate & position /etc/mongod.conf, /etc/systemd/system/mongodb.service
+- name: Populate & position /etc/mongod.conf, mongodb.service
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -27,25 +27,26 @@
     group: root
     mode: 0644
   with_items:
-    - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/mongodb.service' }
     - { src: 'mongod.conf.j2', dest: "{{ mongodb_conf }}" }
+    - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/mongodb.service' }
+
+- name: "systemctl daemon-reload" in case mongodb.service changed
+  systemd:
+    state: restarted
+    daemon_reload: yes
 
 - name: Restart service if enabled
   service:
-    name: "{{ item.name }}"
+    name: mongodb
     enabled: yes
     state: restarted
-  with_items:
-    - { name: mongodb }
   when: mongodb_enabled
 
 - name: Stop service if not enabled
   service:
-    name: "{{ item.name }}"
+    name: mongodb
     enabled: no
     state: stopped
-  with_items:
-    - { name: mongodb }
   when: not mongodb_enabled
 
 - name: Add 'mongodb' to list of services at /etc/iiab/iiab.ini