diff --git a/haproxy.service b/haproxy.service
index b32d00c..e128edf 100644
--- a/haproxy.service
+++ b/haproxy.service
@@ -1,14 +1,17 @@
 [Unit]
 Description=HAProxy Load Balancer
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
+EnvironmentFile=-/etc/sysconfig/haproxy
 Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid"
-ExecStartPre=/usr/sbin/haproxy -f $CONFIG -c -q
-ExecStart=/usr/sbin/haproxy -Ws -f $CONFIG -p $PIDFILE
-ExecReload=/usr/sbin/haproxy -f $CONFIG -c -q
+ExecStartPre=/usr/sbin/haproxy -f $CONFIG -c -q $OPTIONS
+ExecStart=/usr/sbin/haproxy -Ws -f $CONFIG -p $PIDFILE $OPTIONS
+ExecReload=/usr/sbin/haproxy -f $CONFIG -c -q $OPTIONS
 ExecReload=/bin/kill -USR2 $MAINPID
 KillMode=mixed
+SuccessExitStatus=143
 Type=notify
 
 [Install]
diff --git a/haproxy.spec b/haproxy.spec
index 3e0468f..d03827e 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -8,7 +8,7 @@
 
 Name:           haproxy
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HAProxy reverse proxy for high availability environments
 
 License:        GPLv2+
@@ -135,10 +135,13 @@ exit 0
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 15 2020 Ryan O'Hara <rohara@redhat.com> - 2.2.0-3
+- Update systemd service file
+
 * Fri Jul 10 2020 Tom Callaway <spot@fedoraproject.org> - 2.2.0-2
-- fix build against lua 5.4
+- Fix build against lua 5.4
 
-* Thu Jul 09 2020 Ryan O'Hara <rohara@redhat.com> - 2.2.0-0
+* Thu Jul 09 2020 Ryan O'Hara <rohara@redhat.com> - 2.2.0-1
 - Update to 2.2.0 (#1854519)
 
 * Mon Jun 15 2020 Ryan O'Hara <rohara@redhat.com> - 2.1.7-1