diff --git a/roles/mongodb/tasks/install.yml b/roles/mongodb/tasks/install.yml
index ccf5af68e..5306cba29 100644
--- a/roles/mongodb/tasks/install.yml
+++ b/roles/mongodb/tasks/install.yml
@@ -169,6 +169,14 @@
     - { 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' }
 
+# daemon_reload is used to force systemd to recognize a newly installed .service file
+# restarted here to ensure the port has been changed
+- name: Disable 'mongodb' systemd service - started on demand by sugarizer
+  systemd:
+    name: mongodb
+    daemon_reload: yes
+    enabled: no
+    state: restarted
 
 # 3. RECORD MongoDB AS INSTALLED
 
diff --git a/roles/mongodb/tasks/main2.yml b/roles/mongodb/tasks/main2.yml
index 685271b3f..49ec6175f 100644
--- a/roles/mongodb/tasks/main2.yml
+++ b/roles/mongodb/tasks/main2.yml
@@ -2,23 +2,15 @@
   include_tasks: install.yml
   when: mongodb_installed is undefined
 
-# daemon_reload is used to force systemd to recognize a newly installed .service file
-- name: Restart 'mongodb' systemd service if mongodb_enabled
-  systemd:
-    name: mongodb
-    daemon_reload: yes
-    enabled: no
-    state: restarted
-  when: mongodb_enabled | bool
-
 - name: Disable & Stop 'mongodb' service, if not mongodb_enabled
   systemd:
     name: mongodb
-    daemon_reload: yes
     enabled: no
     state: stopped
   when: not mongodb_enabled
 
+#'mongodb' systemd service - started on demand by sugarizer
+# Just recording that mongodb should be running
 
 - name: Add 'mongodb' variable values to {{ iiab_ini_file }}
   ini_file: