diff --git a/tasks/buildbot-worker.yaml b/tasks/buildbot-worker.yaml
index fc1b39c..f15da39 100644
--- a/tasks/buildbot-worker.yaml
+++ b/tasks/buildbot-worker.yaml
@@ -67,3 +67,10 @@
     owner: "{{ buildbot_worker_user }}"
     group: "{{ buildbot_worker_group }}"
   notify: restart buildbot-worker service
+
+- meta: flush_handlers
+
+- name: ensure buildbot-worker service is running
+  systemd:
+    state: started
+    name: buildbot-worker@{{buildbot_worker_name}}.service