diff --git a/roles/fastd/files/fastd@.service b/roles/fastd/files/fastd@.service
index 6a158e7..13ef606 100644
--- a/roles/fastd/files/fastd@.service
+++ b/roles/fastd/files/fastd@.service
@@ -4,6 +4,8 @@ After=network.target
 
 [Service]
 Type=notify
+ExecStartPre=/bin/mkdir -p /run/fastd
+ExecStartPre=/bin/chown -R fastd:fastd /run/fastd
 ExecStart=/usr/bin/fastd --syslog-level info --syslog-ident fastd@%I -c /etc/fastd/%I/fastd.conf
 ExecReload=/bin/kill -HUP $MAINPID
 ExecStopPost=/bin/rm -f /run/fastd-%I.sock
diff --git a/roles/fastd/tasks/main.yml b/roles/fastd/tasks/main.yml
index 10f5561..ca64826 100644
--- a/roles/fastd/tasks/main.yml
+++ b/roles/fastd/tasks/main.yml
@@ -28,9 +28,6 @@
   file: path=/etc/fastd/{{ site_code }}{{ item }}/peers state=directory
   with_sequence: start=0 count={{ fastd_instances }}
 
-- name: Create socket directory
-  file: path=/run/fastd owner=fastd group=fastd state=directory
-
 - name: Configure fastd
   template: src=fastd.conf.j2 dest=/etc/fastd/{{ site_code }}{{ item }}/fastd.conf
   with_sequence: start=0 count={{ fastd_instances }}