diff --git a/inventory/sample/group_vars/k8s-cluster/addons.yml b/inventory/sample/group_vars/k8s-cluster/addons.yml
index a044f5bee..a73f590b8 100644
--- a/inventory/sample/group_vars/k8s-cluster/addons.yml
+++ b/inventory/sample/group_vars/k8s-cluster/addons.yml
@@ -50,7 +50,7 @@ cephfs_provisioner_enabled: false
 ingress_nginx_enabled: false
 # ingress_nginx_host_network: false
 # ingress_nginx_nodeselector:
-#   node-role.kubernetes.io/master: ""
+#   node-role.kubernetes.io/node: ""
 # ingress_nginx_tolerations:
 #   - key: "node-role.kubernetes.io/master"
 #     operator: "Equal"
diff --git a/roles/bootstrap-os/defaults/main.yml b/roles/bootstrap-os/defaults/main.yml
index c0974cfbf..06412a2e0 100644
--- a/roles/bootstrap-os/defaults/main.yml
+++ b/roles/bootstrap-os/defaults/main.yml
@@ -1,7 +1,4 @@
 ---
-bootstrap_os:
-os_family: "{{bootstrap_os}}"
-
 pip_python_coreos_modules:
   - httplib2
   - six
diff --git a/roles/bootstrap-os/tasks/main.yml b/roles/bootstrap-os/tasks/main.yml
index 5fbc4490d..dedfe03cf 100644
--- a/roles/bootstrap-os/tasks/main.yml
+++ b/roles/bootstrap-os/tasks/main.yml
@@ -5,45 +5,26 @@
   changed_when: false
   environment: {}
 
-- name: Set bootstrap_os
-  set_fact:
-    os_family: >-
-      {%- if 'Ubuntu' in os_release.stdout -%}
-      ubuntu
-      {%- elif 'Debian' in os_release.stdout -%}
-      debian
-      {%- elif 'CoreOS' in os_release.stdout -%}
-      coreos
-      {%- elif 'Fedora' in os_release.stdout -%}
-      fedora
-      {%- elif 'CentOS' in os_release.stdout -%}
-      centos
-      {%- elif 'OpenSUSE' in os_release.stdout -%}
-      opensuse
-      {%- elif 'Clear Linux OS' in os_release.stdout -%}
-      clearlinux
-      {%- endif -%}
-
 - include_tasks: bootstrap-ubuntu.yml
-  when: os_family == "ubuntu"
+  when: '"Ubuntu" in os_release.stdout'
 
 - include_tasks: bootstrap-debian.yml
-  when: os_family == "debian"
+  when: '"Debian" in os_release.stdout'
 
 - include_tasks: bootstrap-coreos.yml
-  when: os_family == "coreos"
+  when: '"CoreOS" in os_release.stdout'
 
 - include_tasks: bootstrap-fedora.yml
-  when: os_family == "fedora"
+  when: '"Fedora" in os_release.stdout'
 
 - include_tasks: bootstrap-centos.yml
-  when: os_family == "centos"
+  when: '"CentOS" in os_release.stdout'
 
 - include_tasks: bootstrap-opensuse.yml
-  when: os_family == "opensuse"
+  when: '"OpenSUSE" in os_release.stdout'
 
 - include_tasks: bootstrap-clearlinux.yml
-  when: os_family == "clearlinux"
+  when: '"Clear Linux OS" in os_release.stdout'
 
 - import_tasks: setup-pipelining.yml
 
diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml b/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
index b0d260a4b..e330817de 100644
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
@@ -2,7 +2,7 @@
 ingress_nginx_namespace: "ingress-nginx"
 ingress_nginx_host_network: false
 ingress_nginx_nodeselector:
-  node-role.kubernetes.io/master: ""
+  node-role.kubernetes.io/node: ""
 ingress_nginx_tolerations: []
 ingress_nginx_insecure_port: 80
 ingress_nginx_secure_port: 443