diff --git a/kubernetes/master/calico.sls b/kubernetes/master/calico.sls
index 3d7539d..36df8c4 100644
--- a/kubernetes/master/calico.sls
+++ b/kubernetes/master/calico.sls
@@ -39,7 +39,7 @@
 
 calico_node:
   service.running:
-  - names: calico-node
+  - name: calico-node
   - enable: True
   - watch:
     - file: /etc/systemd/calico-node.service
diff --git a/kubernetes/pool/calico.sls b/kubernetes/pool/calico.sls
index cabb7e5..f962e5c 100644
--- a/kubernetes/pool/calico.sls
+++ b/kubernetes/pool/calico.sls
@@ -55,7 +55,7 @@
 
 calico_node:
   service.running:
-  - names: calico-node
+  - name: calico-node
   - enable: True
   - watch:
     - file: /etc/systemd/calico-node.service
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index b62ab4b..d81695e 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -54,4 +54,7 @@
         dns: RAFeVSE4UvsCz4gk3KYReuOI5jsZ1Xt3
       ca: kubernetes
       storage:
-        engine: none
\ No newline at end of file
+        engine: none
+      namespace:
+        kube-system:
+          enabled: True
\ No newline at end of file
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 9cdded9..0289d32 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -50,4 +50,7 @@
         dns: RAFeVSE4UvsCz4gk3KYReuOI5jsZ1Xt3
       ca: kubernetes
       storage:
-        engine: none
\ No newline at end of file
+        engine: none
+      namespace:
+        kube-system:
+          enabled: True
\ No newline at end of file
diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index 3dead17..7ea3e98 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -1,6 +1,5 @@
 kubernetes:
   common:
-    binaries_version: v1.1.1
     network:
       engine: none
   master:
@@ -59,3 +58,6 @@
       monitoring: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
       scheduler: HY1UUxEPpmjW4a1dDLGIANYQp1nZkLDk
     version: v1.2.4
+    namespace:
+      kube-system:
+        enabled: True
\ No newline at end of file
diff --git a/tests/pillar/pool_cluster.sls b/tests/pillar/pool_cluster.sls
index 2bde4fd..185ff37 100644
--- a/tests/pillar/pool_cluster.sls
+++ b/tests/pillar/pool_cluster.sls
@@ -1,11 +1,12 @@
 kubernetes:
   common:
-    binaries_version: v1.1.1
     network:
       engine: none
   pool:
     enabled: true
     version: v1.2.0
+    host:
+      name: ${linux:system:name}
     master:
       host: 127.0.0.1
       apiserver: