diff --git a/roles/bootstrap-os/tasks/main.yml b/roles/bootstrap-os/tasks/main.yml
index 5d5f05193e970035e56ea54058ca433cfe05e3c9..bb693790233e3ca7218dbbc80021d541805da087 100644
--- a/roles/bootstrap-os/tasks/main.yml
+++ b/roles/bootstrap-os/tasks/main.yml
@@ -11,10 +11,6 @@
 - include: bootstrap-centos.yml
   when: bootstrap_os == "centos"
 
-- task:
-  debug:
-    msg: "bootstrap_os: {{ bootstrap_os|d('') }}"
-
 - include: setup-pipelining.yml
 
 - name: check if atomic host
diff --git a/roles/etcd/tasks/check_certs.yml b/roles/etcd/tasks/check_certs.yml
index 8795fe820cbc3681dbf9c4ac9469d519b0e858b8..337220397763e8b6aa415a9e1207c0f059f3fb40 100644
--- a/roles/etcd/tasks/check_certs.yml
+++ b/roles/etcd/tasks/check_certs.yml
@@ -26,7 +26,7 @@
 - name: "Check_certs | Set 'gen_certs' to true"
   set_fact:
     gen_certs: true
-  when: "not '{{ item }}' in etcdcert_master.files|map(attribute='path') | list"
+  when: not item in etcdcert_master.files|map(attribute='path') | list
   run_once: true
   with_items: >-
        ['{{etcd_cert_dir}}/ca.pem',
diff --git a/roles/kubernetes/master/tasks/main.yml b/roles/kubernetes/master/tasks/main.yml
index 6739443ebc1d72063adc1dd5eb1b621092723830..edc788f72d90ff2e4e72afb1acbe6c84accde2f6 100644
--- a/roles/kubernetes/master/tasks/main.yml
+++ b/roles/kubernetes/master/tasks/main.yml
@@ -41,10 +41,10 @@
     - kubectl
     - upgrade
 
-- task: Include kubeadm setup if enabled
+- name: Include kubeadm setup if enabled
   include: kubeadm-setup.yml
   when: kubeadm_enabled|bool|default(false)
 
-- task: Include static pod setup if not using kubeadm
+- name: Include static pod setup if not using kubeadm
   include: static-pod-setup.yml
   when: not kubeadm_enabled|bool|default(false)
diff --git a/roles/kubernetes/preinstall/tasks/verify-settings.yml b/roles/kubernetes/preinstall/tasks/verify-settings.yml
index aabffb62d461fbc769e1623e9122f0ea0070126f..288964bd17a1dfae6ebc8e16279ca81c1c00eff2 100644
--- a/roles/kubernetes/preinstall/tasks/verify-settings.yml
+++ b/roles/kubernetes/preinstall/tasks/verify-settings.yml
@@ -30,8 +30,8 @@
 
 - name: "Stop if known booleans are set as strings (Use JSON format on CLI: -e \"{'key': true }\")"
   assert:
-    that: hostvars[inventory_hostname][item]|type_debug == 'bool'
-    msg: "{{hostvars[inventory_hostname][item]}} isn't a bool"
+    that: vars[item]|type_debug == 'bool'
+    msg: "{{vars[item]}} isn't a bool"
   run_once: yes
   with_items:
     - kubeadm_enabled
@@ -40,7 +40,7 @@
     - download_always_pull
     - efk_enabled
     - helm_enabled
-    - openstack_lbaas_Enabled
+    - openstack_lbaas_enabled
     - rbac_enabled
   ignore_errors: "{{ ignore_assert_errors }}"