diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml
index ebf0abc73..9fb26a37d 100644
--- a/roles/mongodb/tasks/main.yml
+++ b/roles/mongodb/tasks/main.yml
@@ -30,25 +30,35 @@
     - { 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?)
+- name: Restart service if enabled, with "systemctl daemon-reload" (in case mongodb.service changed?)
   systemd:
-    state: restarted
-    daemon_reload: yes
-
-- name: Restart service if enabled
-  service:
     name: mongodb
     enabled: yes
     state: restarted
+    daemon_reload: yes
   when: mongodb_enabled
 
 - name: Stop service if not enabled
-  service:
+  systemd:
     name: mongodb
     enabled: no
     state: stopped
   when: not mongodb_enabled
 
+#- name: Restart service if enabled
+#  service:
+#    name: mongodb
+#    enabled: yes
+#    state: restarted
+#  when: mongodb_enabled
+
+#- name: Stop service if not enabled
+#  service:
+#    name: mongodb
+#    enabled: no
+#    state: stopped
+#  when: not mongodb_enabled
+
 - name: Add 'mongodb' to list of services at /etc/iiab/iiab.ini
   ini_file:
     dest: "{{ service_filelist }}"