diff --git a/roles/services/tasks/siahsd.yaml b/roles/services/tasks/siahsd.yaml
index 3dcfb31..8bdb03f 100644
--- a/roles/services/tasks/siahsd.yaml
+++ b/roles/services/tasks/siahsd.yaml
@@ -1,12 +1,15 @@
 ---
 # TODO: Install and build
 
-- name: Create log dir
+- name: Create directories
   file:
     path: /var/log/siahsd
     state: directory
     owner: siahsd
     group: nogroup
+  with_items:
+    - /var/log/siahsd
+    - /run/siahsd
 
 - name: Install service file
   template:
diff --git a/roles/services/templates/siahsd.conf b/roles/services/templates/siahsd.conf
index 772c5b4..d6cae94 100644
--- a/roles/services/templates/siahsd.conf
+++ b/roles/services/templates/siahsd.conf
@@ -1,5 +1,5 @@
 [siahsd]
-pid file = /run/siahsd.pid
+pid file = /run/siahsd/siahsd.pid
 log file = /var/log/siahsd/siahsd.log
 log level = 3
 foreground = 0
diff --git a/roles/services/templates/siahsd.service b/roles/services/templates/siahsd.service
index 11176df..66fdc5f 100644
--- a/roles/services/templates/siahsd.service
+++ b/roles/services/templates/siahsd.service
@@ -6,12 +6,11 @@ After=network.target
 
 [Service]
 Type=forking
-PIDFile=/run/siahsd.pid
+PIDFile=/run/siahsd/siahsd.pid
 Restart=always
-RestartSec=2s
+RestartSec=10s
 ExecStart=/usr/local/src/siahsd/build/siahsd
 User=siahsd
 
 [Install]
 WantedBy=multi-user.target
-