diff --git a/files/fail2ban.service b/files/fail2ban.service
index e79faed1..5b661100 100644
--- a/files/fail2ban.service
+++ b/files/fail2ban.service
@@ -5,12 +5,13 @@ After=network.target iptables.service firewalld.service
 PartOf=iptables.service firewalld.service
 
 [Service]
-Type=forking
-ExecStart=/usr/bin/fail2ban-client -x start
+Type=simple
+ExecStart=/usr/bin/fail2ban-server -xf start
 ExecStop=/usr/bin/fail2ban-client stop
 ExecReload=/usr/bin/fail2ban-client reload
 PIDFile=/var/run/fail2ban/fail2ban.pid
-Restart=always
+Restart=on-failure
+RestartPreventExitStatus=0 255
 
 [Install]
 WantedBy=multi-user.target