diff --git a/master/create/handlers/main.yml b/master/create/handlers/main.yml
index 00929d3..8b106e1 100644
--- a/master/create/handlers/main.yml
+++ b/master/create/handlers/main.yml
@@ -1,6 +1,4 @@
 ---
 - name: restart buildbot master
-  service:
-    name: buildbot
-    state: restarted
-
+  set_fact:
+    buildbot_master_restart: true
diff --git a/master/inplace-config/handlers/main.yml b/master/inplace-config/handlers/main.yml
index b9373a6..8b106e1 100644
--- a/master/inplace-config/handlers/main.yml
+++ b/master/inplace-config/handlers/main.yml
@@ -1,5 +1,4 @@
 ---
-- name: reconfigure buildbot master
-  service:
-    name: buildbot
-    state: reloaded
+- name: restart buildbot master
+  set_fact:
+    buildbot_master_restart: true
diff --git a/master/install/handlers/main.yml b/master/install/handlers/main.yml
index 40414a3..3e1f230 100644
--- a/master/install/handlers/main.yml
+++ b/master/install/handlers/main.yml
@@ -1,5 +1,4 @@
 ---
 - name: restart buildbot masters
-  service:
-    name: buildbot
-    state: restarted
+  set_fact:
+    buildbot_master_restart: true
\ No newline at end of file
diff --git a/master/start/tasks/main.yml b/master/start/tasks/main.yml
index e07086a..9b2af3d 100644
--- a/master/start/tasks/main.yml
+++ b/master/start/tasks/main.yml
@@ -1,6 +1,12 @@
 ---
 
-- name: start buildbot master
+- name: enable buildbot master
   service:
     name: buildbot
-    state: started
+    enabled: yes
+
+- name: restart buildbot master
+  service:
+    name: buildbot
+    state: restarted
+  when: "{{ buildbot_master_restart | default(False) }}"
diff --git a/project/add/handlers/main.yml b/project/add/handlers/main.yml
index 6aa3b44..9511069 100644
--- a/project/add/handlers/main.yml
+++ b/project/add/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
 - name: reconfigure buildbot master
-  file:
-    path: "{{ buildbot_master_basedir }}/reconfig.txt"
-    state: touch
+  service:
+    name: "buildbot"
+    state: reloaded
\ No newline at end of file
diff --git a/winworker/create/tasks/store_passwd.yml b/winworker/create/tasks/store_passwd.yml
index 8845321..c01dba5 100644
--- a/winworker/create/tasks/store_passwd.yml
+++ b/winworker/create/tasks/store_passwd.yml
@@ -10,6 +10,7 @@
     src: "{{ buildbot_winworker_password_path }}"
   failed_when: no
   register: buildbot_read_password
+  tags: [always]
 
 - name: store_passwd | Generate Worker Password
   set_fact:
diff --git a/worker/create/handlers/main.yml b/worker/create/handlers/main.yml
index 74b1afe..104cd75 100644
--- a/worker/create/handlers/main.yml
+++ b/worker/create/handlers/main.yml
@@ -7,6 +7,5 @@
   delegate_to: '{{ buildbot_master_host }}'
 
 - name: restart buildbot worker
-  service:
-    name: buildbot-worker
-    state: restarted
+  set_fact:
+    buildbot_worker_restart: true
diff --git a/worker/start/tasks/main.yml b/worker/start/tasks/main.yml
index fae9848..2449345 100644
--- a/worker/start/tasks/main.yml
+++ b/worker/start/tasks/main.yml
@@ -1,7 +1,13 @@
 ---
 - meta: flush_handlers
 
+- name: Restart Worker
+  service:
+    name: buildbot-worker
+    state: restarted
+  when: "{{ buildbot_worker_restart | default(False) }}"
+
 - name: Start Worker
   service:
     name: buildbot-worker
-    state: started
\ No newline at end of file
+    enabled: yes
\ No newline at end of file