diff --git a/system/systemd/kazoo-applications.service b/system/systemd/kazoo-applications.service
index 4727b16..34a860c 100644
--- a/system/systemd/kazoo-applications.service
+++ b/system/systemd/kazoo-applications.service
@@ -8,8 +8,8 @@ Group=daemon
 PermissionsStartOnly=true
 ExecStartPre=/usr/sbin/kazoo-applications prepare
 ExecStart=/usr/sbin/kazoo-applications foreground
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecStop=/usr/sbin/kazoo-applications stop
 Restart=on-abort
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/system/systemd/kazoo-ecallmgr.service b/system/systemd/kazoo-ecallmgr.service
index 5ca18c5..eab29e4 100644
--- a/system/systemd/kazoo-ecallmgr.service
+++ b/system/systemd/kazoo-ecallmgr.service
@@ -8,8 +8,8 @@ Group=daemon
 PermissionsStartOnly=true
 ExecStartPre=/usr/sbin/kazoo-ecallmgr prepare
 ExecStart=/usr/sbin/kazoo-ecallmgr foreground
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecStop=/usr/sbin/kazoo-ecallmgr stop
 Restart=on-abort
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/system/systemd/kazoo-freeswitch.service b/system/systemd/kazoo-freeswitch.service
index 095bcab..bb8f019 100644
--- a/system/systemd/kazoo-freeswitch.service
+++ b/system/systemd/kazoo-freeswitch.service
@@ -8,12 +8,12 @@ User=freeswitch
 Group=daemon
 PermissionsStartOnly=true
 # RuntimeDirectory is not yet supported in CentOS 7. A workaround is to use /etc/tmpfiles.d/freeswitch.conf
-#RuntimeDirectory=/run/freeswitch
-#RuntimeDirectoryMode=0750
+# RuntimeDirectory=/run/freeswitch
+# RuntimeDirectoryMode=0750
 ExecStartPre=/usr/sbin/kazoo-freeswitch prepare
 ExecStart=/usr/sbin/kazoo-freeswitch foreground -nc -nf
 ExecReload=/usr/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/system/systemd/kazoo-haproxy.service b/system/systemd/kazoo-haproxy.service
index ddaaa5a..b5ad2d1 100644
--- a/system/systemd/kazoo-haproxy.service
+++ b/system/systemd/kazoo-haproxy.service
@@ -11,7 +11,8 @@ Environment=HAPROXY_BIN=/usr/sbin/haproxy-systemd-wrapper
 ExecStartPre=/usr/sbin/kazoo-haproxy prepare
 ExecStart=/usr/sbin/kazoo-haproxy foreground
 ExecReload=/bin/kill -USR2 $MAINPID
+ExecStop=/usr/sbin/kazoo-haproxy stop
 Restart=on-abort
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/system/systemd/kazoo-kamailio.service b/system/systemd/kazoo-kamailio.service
index 8c2aeef..a8c7698 100644
--- a/system/systemd/kazoo-kamailio.service
+++ b/system/systemd/kazoo-kamailio.service
@@ -8,8 +8,8 @@ Group=daemon
 PermissionsStartOnly=true
 ExecStartPre=/usr/sbin/kazoo-kamailio prepare
 ExecStart=/usr/sbin/kazoo-kamailio foreground
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecStop=/usr/sbin/kazoo-kamailio stop
 Restart=on-abort
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target