diff --git a/.yamllint b/.yamllint
index b81f5ac1..c2321b0f 100644
--- a/.yamllint
+++ b/.yamllint
@@ -12,3 +12,4 @@ ignore: |
   .github/
   inventory/sample/group_vars/rke2_servers.yml
   inventory/sample/group_vars/rke2_agents.yml
+  inventory/test-inventory*
diff --git a/roles/rke2_common/tasks/config.yml b/roles/rke2_common/tasks/config.yml
index 752e333b..19a1a678 100644
--- a/roles/rke2_common/tasks/config.yml
+++ b/roles/rke2_common/tasks/config.yml
@@ -101,7 +101,7 @@
   register: updated_rke2_config
   changed_when: false
 
-- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
+- name: Update rke2_config to take value of updated_rke2_config  # noqa no-handler
   set_fact:
     rke2_config: "{{ updated_rke2_config.rke2_config }}"
   when: updated_rke2_config.changed
@@ -117,7 +117,7 @@
   register: updated_rke2_config
   changed_when: false
 
-- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
+- name: Update rke2_config to take value of updated_rke2_config  # noqa no-handler
   set_fact:
     rke2_config: "{{ updated_rke2_config.rke2_config }}"
   when: updated_rke2_config.changed
@@ -133,7 +133,7 @@
   register: updated_rke2_config
   changed_when: false
 
-- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
+- name: Update rke2_config to take value of updated_rke2_config  # noqa no-handler
   set_fact:
     rke2_config: "{{ updated_rke2_config.rke2_config }}"
   when: updated_rke2_config.changed
@@ -150,7 +150,7 @@
   register: updated_rke2_config
   changed_when: false
 
-- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
+- name: Update rke2_config to take value of updated_rke2_config  # noqa no-handler
   set_fact:
     rke2_config: "{{ updated_rke2_config.rke2_config }}"
   when: updated_rke2_config.changed
@@ -166,7 +166,7 @@
   register: updated_rke2_config
   changed_when: false
 
-- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
+- name: Update rke2_config to take value of updated_rke2_config  # noqa no-handler
   set_fact:
     rke2_config: "{{ updated_rke2_config.rke2_config }}"
   when: updated_rke2_config.changed
@@ -181,7 +181,7 @@
   when: (cloud_provider_name is defined) and (cloud_provider_name|length > 0)
   register: updated_rke2_config
 
-- name: Update rke2_config to take value of updated_rke2_config # noqa no-handler
+- name: Update rke2_config to take value of updated_rke2_config  # noqa no-handler
   set_fact:
     rke2_config: "{{ updated_rke2_config.rke2_config }}"
   when: updated_rke2_config.changed
diff --git a/roles/rke2_common/tasks/main.yml b/roles/rke2_common/tasks/main.yml
index 5dcbc184..04c67f6c 100644
--- a/roles/rke2_common/tasks/main.yml
+++ b/roles/rke2_common/tasks/main.yml
@@ -50,7 +50,9 @@
     name: firewalld
     state: stopped
     enabled: no
-  when: ansible_facts.services["firewalld.service"] is defined and ansible_facts.services["firewalld.service"].status != "not-found"
+  when:
+    - ansible_facts.services["firewalld.service"] is defined
+    - ansible_facts.services["firewalld.service"].status != "not-found"
 
 - include: network_manager_fix.yaml
 
diff --git a/roles/rke2_common/tasks/rpm_install.yml b/roles/rke2_common/tasks/rpm_install.yml
index f87d0c85..83d66e42 100644
--- a/roles/rke2_common/tasks/rpm_install.yml
+++ b/roles/rke2_common/tasks/rpm_install.yml
@@ -1,6 +1,7 @@
 ---
-- name: Calculate rke2_full_version
-  when: ( install_rke2_version is not defined ) or ( install_rke2_version | length == 0 )
+
+- name: "Calculate rke2 full version "
+  when: ( install_rke2_version is not defined ) or ( install_rke2_version | length == 0 )  # noqa var-spacing
   block:
   - name: Stop if the provided is not valid
     fail:
@@ -20,7 +21,7 @@
     args:
       executable: /usr/bin/bash
 
-- name: Set rke2_full_version fact
+- name: Set rke2_full_version fact  # noqa var-spacing
   set_fact:
     rke2_full_version: "{{ rke2_full_version.stdout if ((install_rke2_version is not defined) or (install_rke2_version|length == 0)) else install_rke2_version }}"  # yamllint disable-line rule:line-length
 
diff --git a/roles/rke2_common/tasks/tarball_install.yml b/roles/rke2_common/tasks/tarball_install.yml
index e46fa888..83eb2e1f 100644
--- a/roles/rke2_common/tasks/tarball_install.yml
+++ b/roles/rke2_common/tasks/tarball_install.yml
@@ -28,7 +28,7 @@
     mode: '0644'
   when: rke2_binary_tarball_check.stat.exists
 
-- name: Download tarball
+- name: Download tarball  # noqa var-spacing
   when: not rke2_binary_tarball_check.stat.exists
   block:
     - name: Stop if the provided channel is not valid
diff --git a/roles/rke2_server/tasks/first_server.yml b/roles/rke2_server/tasks/first_server.yml
index eefbdf18..2eb61ef4 100644
--- a/roles/rke2_server/tasks/first_server.yml
+++ b/roles/rke2_server/tasks/first_server.yml
@@ -16,7 +16,7 @@
 
 - name: Wait for k8s apiserver
   wait_for:
-    host: "{{ kubernetes_api_server_host }}"
+    host: localhost
     port: "6443"
     state: present
     timeout: 300
@@ -30,7 +30,7 @@
   delay: 10
   changed_when: false
 
-- name: Extract the hostname-override parameter from the kubelet process
+- name: Extract the hostname-override parameter from the kubelet process  # noqa var-spacing
   set_fact:
     kubelet_hostname_override_parameter: "{{ kubelet_check.stdout |\
       regex_search('\\s--hostname-override=((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9]))\\s',\
diff --git a/roles/rke2_server/tasks/other_servers.yml b/roles/rke2_server/tasks/other_servers.yml
index 87b48db7..8c0b636f 100644
--- a/roles/rke2_server/tasks/other_servers.yml
+++ b/roles/rke2_server/tasks/other_servers.yml
@@ -30,7 +30,7 @@
   when:
     - '"server:" not in server_url_check.stdout'
 
-- name: Start and wait for healthy node
+- name: Start and wait for healthy node  # noqa var-spacing
   throttle: 1
   block:
     - name: Start rke2-server
@@ -55,7 +55,7 @@
       delay: 10
       changed_when: false
 
-    - name: Extract the hostname-override parameter from the kubelet process
+    - name: Extract the hostname-override parameter from the kubelet process  # noqa var-spacing
       set_fact:
         kubelet_hostname_override_parameter: "{{ kubelet_check.stdout |\
           regex_search('\\s--hostname-override=((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9]))\\s',\
diff --git a/roles/testing/tasks/kubectl_basic.yml b/roles/testing/tasks/kubectl_basic.yml
index 5a5a3960..f1c4bed9 100644
--- a/roles/testing/tasks/kubectl_basic.yml
+++ b/roles/testing/tasks/kubectl_basic.yml
@@ -10,7 +10,7 @@
   delay: 10
   changed_when: false
 
-- name: Extract the hostname-override parameter from the kubelet process
+- name: Extract the hostname-override parameter from the kubelet process  # noqa var-spacing
   set_fact:
     kubelet_hostname_override_parameter: "{{ kubelet_check.stdout |\
       regex_search('\\s--hostname-override=((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9]))\\s',\