diff --git a/roles/unbound/handlers/main.yml b/roles/unbound/handlers/main.yml
index ddcd7b8..e165c7d 100644
--- a/roles/unbound/handlers/main.yml
+++ b/roles/unbound/handlers/main.yml
@@ -5,10 +5,10 @@
     state: reloaded
 
 - name: Reload unbound
-  command: s6-svc -h /run/service/unbound
+  command: s6-svc -h {{ s6_scan_dir }}/unbound
 
 - name: Restart unbound
-  command: s6-svc -wR -T 5000 -ru /run/service/unbound
+  command: s6-svc -wR -T 5000 -ru {{ s6_scan_dir }}/unbound
 
 - name: Restart unbound log
-  command: s6-svc -wR -T 5000 -ru /run/service/unbound-log
+  command: s6-svc -wR -T 5000 -ru {{ s6_scan_dir }}/unbound-log
diff --git a/roles/unbound/tasks/main.yml b/roles/unbound/tasks/main.yml
index 4767093..0172948 100644
--- a/roles/unbound/tasks/main.yml
+++ b/roles/unbound/tasks/main.yml
@@ -67,7 +67,7 @@
   meta: flush_handlers
 
 - name: Start unbound
-  command: fdmove -c 2 1 s6-rc -u -v 2 -t 15000 change unbound
+  command: fdmove -c 2 1 s6-rc -l {{ s6_live_dir }} -u -v 2 -t 15000 change unbound
   register: change
   changed_when: change.stdout | length > 0