diff --git a/files/fail2ban-tmpfiles.conf b/files/fail2ban-tmpfiles.conf
deleted file mode 100644
index 68f8e345..00000000
--- a/files/fail2ban-tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /run/fail2ban 0755 root root -
\ No newline at end of file
diff --git a/files/fail2ban.service.in b/files/fail2ban.service.in
index 9a245c61..e93fd596 100644
--- a/files/fail2ban.service.in
+++ b/files/fail2ban.service.in
@@ -7,13 +7,13 @@ PartOf=iptables.service firewalld.service ip6tables.service ipset.service nftabl
 [Service]
 Type=simple
 Environment="PYTHONNOUSERSITE=1"
-ExecStartPre=/bin/mkdir -p /run/fail2ban
+RuntimeDirectory=fail2ban
+StateDirectory=fail2ban
 ExecStart=@BINDIR@/fail2ban-server -xf start
 # if should be logged in systemd journal, use following line or set logtarget to sysout in fail2ban.local
 # ExecStart=@BINDIR@/fail2ban-server -xf --logtarget=sysout start
 ExecStop=@BINDIR@/fail2ban-client stop
 ExecReload=@BINDIR@/fail2ban-client reload
-PIDFile=/run/fail2ban/fail2ban.pid
 Restart=on-failure
 RestartPreventExitStatus=0 255