diff --git a/roles/kubernetes/master/tasks/static-pod-setup.yml b/roles/kubernetes/master/tasks/static-pod-setup.yml
index b94c07431..d20557e95 100644
--- a/roles/kubernetes/master/tasks/static-pod-setup.yml
+++ b/roles/kubernetes/master/tasks/static-pod-setup.yml
@@ -12,7 +12,6 @@
   template:
     src: namespace.j2
     dest: "{{kube_config_dir}}/{{system_namespace}}-ns.yml"
-  run_once: yes
   when: inventory_hostname == groups['kube-master'][0]
   tags: apps
 
@@ -21,7 +20,7 @@
   register: 'kubesystem'
   changed_when: False
   failed_when: False
-  run_once: yes
+  when: inventory_hostname == groups['kube-master'][0]
   tags: apps
 
 - name: Create kube system namespace