diff --git a/barbican/server.sls b/barbican/server.sls
index 7d5d07f..a420d21 100644
--- a/barbican/server.sls
+++ b/barbican/server.sls
@@ -40,6 +40,8 @@
     - sls: barbican._ssl.plugin
   - require_in:
     - sls: barbican.db.offline_sync
+  - watch_in:
+    - service: apache_service
 
 barbican_sync_secret_stores:
   cmd.run:
@@ -135,6 +137,8 @@
     - name: barbican-api
     - require:
       - barbican_apache_conf_file
+    - watch_in:
+      - service: apache_service
 
 {%- else %}
 
@@ -163,21 +167,11 @@
     - require:
       - barbican_apache_conf_file
       - barbican_sync_secret_stores
+    - watch_in:
+      - service: apache_service
 
 {%- endif %}
 
-barbican_apache_restart:
-  service.running:
-  - enable: true
-  - name: apache2
-  - init_delay: 5
-  {%- if grains.get('noservices') %}
-  - onlyif: /bin/false
-  {%- endif %}
-  - watch:
-    - file: /etc/barbican/barbican.conf
-    - barbican_apache_conf_file
-
 barbican_server_services:
   service.running:
   - names: {{ server.services }}