diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index b7364ce..ddeba5e 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -7,8 +7,11 @@
   kubernetes:
     master:
       enabled: true
+      unschedulable: true
       registry:
         host: tcpcloud
+      host:
+        name: ${linux:system:name}
       service_addresses: 10.254.0.0/16
       admin:
         username: ${_param:kubernetes_admin_user}
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 3a6440c..d9d24a1 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -7,8 +7,11 @@
   kubernetes:
     master:
       enabled: true
+      unschedulable: false
       registry:
         host: tcpcloud
+      host:
+        name: ${linux:system:name}
       service_addresses: 10.254.0.0/16
       admin:
         username: ${_param:kubernetes_admin_user}