diff --git a/kubernetes/files/conformance/virtlet_conformance.yml b/kubernetes/files/conformance/virtlet-conformance.yml
similarity index 100%
rename from kubernetes/files/conformance/virtlet_conformance.yml
rename to kubernetes/files/conformance/virtlet-conformance.yml
diff --git a/kubernetes/master/flannel.sls b/kubernetes/master/flannel.sls
index c11283d..aaae1c5 100644
--- a/kubernetes/master/flannel.sls
+++ b/kubernetes/master/flannel.sls
@@ -1,8 +1,6 @@
 {%- from "kubernetes/map.jinja" import master with context %}
 {%- if master.enabled %}
 
-{%- if not pillar.kubernetes.pool is defined %}
-
 /etc/cni/net.d/12-flannel.conflist:
   file.managed:
     - source: salt://kubernetes/files/flannel/flannel.conflist
@@ -14,5 +12,3 @@
     - template: jinja
 
 {%- endif %}
-
-{%- endif %}
diff --git a/kubernetes/master/genie.sls b/kubernetes/master/genie.sls
index cb1b7e6..ff34e46 100644
--- a/kubernetes/master/genie.sls
+++ b/kubernetes/master/genie.sls
@@ -1,8 +1,6 @@
 {%- from "kubernetes/map.jinja" import master with context %}
 {%- if master.enabled %}
 
-{%- if not pillar.kubernetes.pool is defined %}
-
 /etc/cni/net.d/00-genie.conf:
   file.managed:
     - source: salt://kubernetes/files/genie/genie.conf
@@ -30,5 +28,3 @@
     {%- endif %}
 
 {%- endif %}
-
-{%- endif %}
diff --git a/kubernetes/master/init.sls b/kubernetes/master/init.sls
index 29cf645..3b04778 100644
--- a/kubernetes/master/init.sls
+++ b/kubernetes/master/init.sls
@@ -9,15 +9,11 @@
 - kubernetes.master.opencontrail
 {%- endif %}
 {%- if master.network.get('calico', {}).get('enabled', False) %}
-{%- if not pillar.kubernetes.pool is defined %}
 - kubernetes.master.calico
 {%- endif %}
-{%- endif %}
 {%- if master.network.get('genie', {}).get('enabled', False) %}
-{%- if not pillar.kubernetes.pool is defined %}
 - kubernetes.master.genie
 {%- endif %}
-{%- endif %}
 {%- if master.network.get('sriov', {}).get('enabled', False) %}
 - kubernetes.master.sriov
 {%- endif %}
diff --git a/kubernetes/master/setup.sls b/kubernetes/master/setup.sls
index 8b40455..19cd8d9 100644
--- a/kubernetes/master/setup.sls
+++ b/kubernetes/master/setup.sls
@@ -104,9 +104,9 @@
 
 {%- if common.addons.get('virtlet', {}).get('enabled') %}
 
-/srv/kubernetes/virtlet_conformance.yml:
+/srv/kubernetes/virtlet-conformance.yml:
   file.managed:
-    - source: salt://kubernetes/files/conformance/virtlet_conformance.yml
+    - source: salt://kubernetes/files/conformance/virtlet-conformance.yml
     - template: jinja
     - user: root
     - group: root
diff --git a/kubernetes/master/sriov.sls b/kubernetes/master/sriov.sls
index 7091f35..19ea51b 100644
--- a/kubernetes/master/sriov.sls
+++ b/kubernetes/master/sriov.sls
@@ -1,7 +1,6 @@
 {%- from "kubernetes/map.jinja" import master with context %}
 {%- if master.enabled %}
 
-{%- if not pillar.kubernetes.pool is defined %}
 /etc/cni/net.d/13-sriov.conf:
   file.managed:
     - source: salt://kubernetes/files/sriov/sriov.conf
@@ -29,4 +28,3 @@
     {%- endif %}
 
 {%- endif %}
-{%- endif %}
diff --git a/kubernetes/pool/flannel.sls b/kubernetes/pool/flannel.sls
index 416a107..006e21e 100644
--- a/kubernetes/pool/flannel.sls
+++ b/kubernetes/pool/flannel.sls
@@ -1,6 +1,8 @@
 {%- from "kubernetes/map.jinja" import pool with context %}
 {%- if pool.enabled %}
 
+{%- if not pillar.kubernetes.master is defined %}
+
 /etc/cni/net.d/12-flannel.conflist:
   file.managed:
     - source: salt://kubernetes/files/flannel/flannel.conflist
@@ -12,3 +14,5 @@
     - template: jinja
 
 {%- endif %}
+
+{%- endif %}
diff --git a/kubernetes/pool/genie.sls b/kubernetes/pool/genie.sls
index fc05825..842ac05 100644
--- a/kubernetes/pool/genie.sls
+++ b/kubernetes/pool/genie.sls
@@ -1,6 +1,8 @@
 {%- from "kubernetes/map.jinja" import pool with context %}
 {%- if pool.enabled %}
 
+{%- if not pillar.kubernetes.master is defined %}
+
 /etc/cni/net.d/00-genie.conf:
   file.managed:
     - source: salt://kubernetes/files/genie/genie.conf
@@ -28,3 +30,5 @@
     {%- endif %}
 
 {%- endif %}
+
+{%- endif %}
diff --git a/kubernetes/pool/init.sls b/kubernetes/pool/init.sls
index d5acd23..21d5bee 100644
--- a/kubernetes/pool/init.sls
+++ b/kubernetes/pool/init.sls
@@ -1,9 +1,11 @@
 {%- from "kubernetes/map.jinja" import pool with context %}
 {%- from "kubernetes/map.jinja" import common with context -%}
 include:
+{%- if not pillar.kubernetes.master is defined %}
 {%- if pool.network.get('calico', {}).get('enabled', False) %}
 - kubernetes.pool.calico
 {%- endif %}
+{%- endif %}
 {%- if pool.network.get('opencontrail', {}).get('enabled', False) %}
 - kubernetes.pool.opencontrail
 {%- endif %}
@@ -11,9 +13,11 @@
 {%- if pool.network.get('flannel', {}).get('enabled', False) %}
 - kubernetes.pool.flannel
 {%- endif %}
+{%- if not pillar.kubernetes.master is defined %}
 {%- if pool.network.get('genie', {}).get('enabled', False) %}
 - kubernetes.pool.genie
 {%- endif %}
+{%- endif %}
 {%- if pool.network.get('sriov', {}).get('enabled', False) %}
 - kubernetes.pool.sriov
 {%- endif %}
diff --git a/kubernetes/pool/sriov.sls b/kubernetes/pool/sriov.sls
index d471c37..e55dd52 100644
--- a/kubernetes/pool/sriov.sls
+++ b/kubernetes/pool/sriov.sls
@@ -1,6 +1,7 @@
 {%- from "kubernetes/map.jinja" import pool with context %}
 {%- if pool.enabled %}
 
+{%- if not pillar.kubernetes.master is defined %}
 /etc/cni/net.d/13-sriov.conf:
   file.managed:
     - source: salt://kubernetes/files/sriov/sriov.conf
@@ -28,3 +29,4 @@
     {%- endif %}
 
 {%- endif %}
+{%- endif %}