diff --git a/mongodb/service/clean.sls b/mongodb/service/clean.sls
index 9c7ea47..47c7d19 100644
--- a/mongodb/service/clean.sls
+++ b/mongodb/service/clean.sls
@@ -29,7 +29,7 @@ include:
   service.dead:
     - name: {{ servicename }}
                             {% if grains.kernel|lower == 'linux' %}
-    - onlyif: systemctl list-units |grep {{ servicename }} >/dev/null 2>&1
+    - onlyif: systemctl list-unit-files |grep {{ servicename }} >/dev/null 2>&1
                             {%- endif %}  {# linux #}
     - enable: False
             {%- endif %}
diff --git a/mongodb/service/running.sls b/mongodb/service/running.sls
index 7db2a86..93fe736 100644
--- a/mongodb/service/running.sls
+++ b/mongodb/service/running.sls
@@ -34,7 +34,7 @@ include:
     - reload_modules: true
   service.running:
     - name: firewalld
-    - onlyif: systemctl list-units | grep firewalld >/dev/null 2>&1
+    - onlyif: systemctl list-unit-files | grep firewalld >/dev/null 2>&1
     - enable: True
         {%- endif %}
     {%- endif %}
@@ -236,7 +236,7 @@ include:
     - name: {{ servicename }}
     - onlyif:
        - {{ grains.kernel|lower == 'linux' }}
-       - systemctl list-units | grep {{ servicename }} >/dev/null 2>&1
+       - systemctl list-unit-files | grep {{ servicename }} >/dev/null 2>&1
     - require:
       - sls: {{ sls_software_install }}
       - sls: {{ sls_config_users }}
@@ -252,14 +252,23 @@ include:
                         {%- else %}
   service.running:
     - name: {{ servicename }}
-    - enable: True
-    - onlyif: systemctl list-units | grep {{ servicename }} >/dev/null 2>&1
+    - onlyif: systemctl list-unit-files | grep {{ servicename }} >/dev/null 2>&1
+    - require:
+      - sls: {{ sls_software_install }}
+      - sls: {{ sls_config_users }}
+                            {%- if 'config' in software and software['config'] is mapping %}
+    - watch:
+      - file: {{ formula }}-config-file-{{ servicename }}-file-managed
+                            {%- endif %}
+{{ formula }}-service-running-{{ comp }}-{{ servicename }}-enabled:
+  service.enabled:
+    - name: {{ servicename }}
+    - onlyif: systemctl list-unit-files | grep {{ servicename }} >/dev/null 2>&1
                         {%- endif %}
     - require:
       - sls: {{ sls_software_install }}
       - sls: {{ sls_config_users }}
                         {%- if 'config' in software and software['config'] is mapping %}
-    - watch:
       - file: {{ formula }}-config-file-{{ servicename }}-file-managed
                         {%- endif %}