diff --git a/.SRCINFO b/.SRCINFO
index a2ca154..39ce83d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = teleport-bin
 	pkgdesc = Modern SSH server for teams managing distributed infrastructure
 	pkgver = 3.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/gravitational/teleport
 	install = teleport.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index c4c06c4..00827b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=teleport-bin
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern SSH server for teams managing distributed infrastructure"
 arch=('x86_64' 'arm')
 url="https://github.com/gravitational/teleport"
diff --git a/teleport.service b/teleport.service
index 98a0b9f..26f0e1b 100644
--- a/teleport.service
+++ b/teleport.service
@@ -4,8 +4,10 @@ After=network.target
 
 [Service]
 Type=simple
-Restart=always
-ExecStart=/usr/bin/teleport start
+Restart=on-failure
+ExecStart=/usr/local/bin/teleport start --config=/etc/teleport.yaml --pid-file=/var/run/teleport.pid
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=/var/run/teleport.pid
 
 [Install]
 WantedBy=multi-user.target