diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
index 876da5693c..3330171c93 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
@@ -218,7 +218,6 @@ fi
 
 KUBELET_ARGS="${KUBELET_ARGS} --network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin"
 KUBELET_ARGS="${KUBELET_ARGS} --register-with-taints=CriticalAddonsOnly=True:NoSchedule,dedicated=master:NoSchedule"
-KUBELET_ARGS="${KUBELET_ARGS} --node-labels=node-role.kubernetes.io/master=\"\""
 
 KUBELET_KUBECONFIG=/etc/kubernetes/kubelet-config.yaml
 cat << EOF >> ${KUBELET_KUBECONFIG}
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh
index 488c1bdf7c..2bd9b8e1f0 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh
@@ -21,3 +21,12 @@ for service in etcd docker kube-apiserver kube-controller-manager kube-scheduler
     $ssh_cmd systemctl enable $service
     $ssh_cmd systemctl --no-block restart $service
 done
+
+# Label self as master
+until  [ "ok" = "$(curl --silent http://127.0.0.1:8080/healthz)" ] && \
+    kubectl patch node ${INSTANCE_NAME} \
+        --patch '{"metadata": {"labels": {"node-role.kubernetes.io/master": ""}}}'
+do
+    echo "Trying to label master node with node-role.kubernetes.io/master=\"\""
+    sleep 5s
+done