diff --git a/apache/config/file.sls b/apache/config/file.sls
index 2da8862c..9db036a1 100644
--- a/apache/config/file.sls
+++ b/apache/config/file.sls
@@ -19,7 +19,7 @@ apache-config-file-directory-logdir:
     - makedirs: True
     - require:
       - sls: {{ sls_package_install }}
-    - require_in:
+    - watch_in:
       - service: apache-service-running
 
 apache-config-file-directory-vhostdir:
@@ -28,7 +28,7 @@ apache-config-file-directory-vhostdir:
     - makedirs: True
     - require:
       - sls: {{ sls_package_install }}
-    - require_in:
+    - watch_in:
       - service: apache-service-running
 
 apache-config-file-directory-moddir:
@@ -37,7 +37,7 @@ apache-config-file-directory-moddir:
     - makedirs: True
     - require:
       - sls: {{ sls_package_install }}
-    - require_in:
+    - watch_in:
       - service: apache-service-running
 
     {%- if apache.davlockdbdir %}
@@ -53,7 +53,7 @@ apache-config-file-directory-davlockdbdir:
       - group
     - require:
       - sls: {{ sls_package_install }}
-    - require_in:
+    - watch_in:
       - service: apache-service-running
 
     {%- endif %}
@@ -65,7 +65,7 @@ apache-config-file-directory-sites-enabled:
     - makedirs: True
     - require:
       - sls: {{ sls_package_install }}
-    - require_in:
+    - watch_in:
       - service: apache-service-running
 
     {%- endif %}
@@ -77,7 +77,7 @@ apache-config-file-directory-conf-enabled:
     - makedirs: True
     - require:
       - sls: {{ sls_package_install }}
-    - require_in:
+    - watch_in:
       - service: apache-service-running
 
     {%- endif %}
@@ -97,6 +97,8 @@ apache-config-file-managed:
       - sls: {{ sls_package_install }}
     - context:
         apache: {{ apache | json }}
+    - watch_in:
+      - service: apache-service-running
 
   {%- if grains.os_family in ('Debian', 'FreeBSD') %}
 
@@ -111,7 +113,7 @@ apache-config-file-managed-{{ grains.os }}-env:
     - template: {{ apache.get('template_engine', 'jinja') }}
     - context:
       apache: {{ apache | json }}
-    - require_in:
+    - watch_in:
       - file: apache-config-file-managed-{{ grains.os }}-ports
 
 apache-config-file-managed-{{ grains.os }}-ports:
@@ -158,6 +160,4 @@ apache-config-file-managed-skip:
       - sls: {{ sls_package_install }}
     - watch_in:
       - module: apache-service-running-restart
-    - require_in:
-      - module: apache-service-running-restart
       - service: apache-service-running
diff --git a/apache/config/modules/install.sls b/apache/config/modules/install.sls
index 9cc52730..b85c80c0 100644
--- a/apache/config/modules/install.sls
+++ b/apache/config/modules/install.sls
@@ -41,7 +41,7 @@ apache-config-modules-{{ module }}-enable:
         {%- endif %}
     - order: 225
     - require:
-      - sls: {{ sls_config_file }}
+      - file: apache-config-file-directory-moddir
     - watch_in:
       - module: apache-service-running-restart
     - require_in:
diff --git a/apache/service/running.sls b/apache/service/running.sls
index 07299777..bd4cf667 100644
--- a/apache/service/running.sls
+++ b/apache/service/running.sls
@@ -16,12 +16,10 @@ apache-service-running:
   service.running:
     - name: {{ apache.service.name }}
     - enable: True
-    - watch:
-      - sls: {{ sls_config_file }}
     - retry: {{ apache.retry_option|json }}
   cmd.run:
     - names:
-      - journalctl -xe -u {{ apache.service.name }} || tail -20 /var/log/messages || true
+      - journalctl -n20 -e -u {{ apache.service.name }} || tail -20 /var/log/messages || true
       - (service {{ apache.service.name }} restart && service {{ apache.service.name }} status) || true
       - cat {{ apache.config }}
     - onfail:
@@ -41,10 +39,7 @@ apache-service-running-restart:
     - cmd: {{ apache.custom_reload_command|default('apachectl graceful') }}
     - python_shell: True
          {%- endif %}
-    - watch:
-      - sls: {{ sls_config_file }}
-    - require:
-      - sls: {{ sls_config_file }}
+    - after:
       - service: apache-service-running
 
 apache-service-running-reload:
@@ -57,8 +52,5 @@ apache-service-running-reload:
     - cmd: {{ apache.custom_reload_command|default('apachectl graceful') }}
     - python_shell: True
          {%- endif %}
-    - watch:
-      - sls: {{ sls_config_file }}
-    - require:
-      - sls: {{ sls_config_file }}
+    - after:
       - service: apache-service-running