diff --git a/roles/kubernetes/tasks/Rocky.yml b/roles/kubernetes/tasks/Rocky.yml
index 690f62f..9c9b2f8 100644
--- a/roles/kubernetes/tasks/Rocky.yml
+++ b/roles/kubernetes/tasks/Rocky.yml
@@ -18,10 +18,6 @@
       XDG_CONFIG_HOME: /home/jd/.config
       KUBECONFIG: "{{ kubeconfig }}"
   block:
-    - name: Facts
-      ansible.builtin.setup:
-      when: ansible_facts.architecture is not defined
-      
     - name: Get root mount
       set_fact:
         root_mount: "{{ ansible_mounts | selectattr('mount', 'equalto', '/') | first }}"
@@ -161,6 +157,11 @@
         enabled: yes
         state: started
 
+    - name: Check if firewalld is installed
+      ansible.builtin.command: rpm -q firewalld
+      register: firewalld_check
+      ignore_errors: true
+
     - name: Ensure firewalld is running
       ansible.builtin.service:
         name: firewalld
@@ -168,7 +169,7 @@
         enabled: true
       when: 
         - inventory_hostname.endswith('-vm01.home.lan')
-        - "'firewalld' in ansible_facts.packages"
+        - firewalld_check.rc == 0
         
     - name: Open Kubernetes API server port (6443)
       ansible.posix.firewalld:
@@ -178,7 +179,7 @@
         immediate: yes
       when: 
         - inventory_hostname.endswith('-vm01.home.lan')
-        - "'firewalld' in ansible_facts.packages"
+        - firewalld_check.rc == 0
 
 
     - name: Open etcd ports (2379-2380)
@@ -189,7 +190,7 @@
         immediate: yes
       when: 
         - inventory_hostname.endswith('-vm01.home.lan')
-        - "'firewalld' in ansible_facts.packages"
+        - firewalld_check.rc == 0
 
     - name: Open kubelet and scheduler ports (10250-10252)
       ansible.posix.firewalld:
@@ -198,7 +199,7 @@
         state: enabled
         immediate: yes
       when: 
-        - "'firewalld' in ansible_facts.packages"
+        - firewalld_check.rc == 0
 
     - name: Restart containerd
       systemd:
@@ -325,7 +326,7 @@
         state: enabled
         immediate: yes
       when: 
-        - "'firewalld' in ansible_facts.packages"
+        - firewalld_check.rc == 0
 
     - name: Allow UDP 8472 from 192.168.77.0/24
       firewalld:
@@ -334,7 +335,7 @@
         state: enabled
         immediate: yes
       when: 
-        - "'firewalld' in ansible_facts.packages"
+        - firewalld_check.rc == 0
         
     - name: Add flannel.1 interface to trusted zone
       firewalld:
@@ -343,7 +344,7 @@
         state: enabled
         immediate: yes
       when: 
-        - "'firewalld' in ansible_facts.packages"
+        - firewalld_check.rc == 0
 
     - name: Add cni0 interface to trusted zone
       firewalld:
@@ -352,7 +353,7 @@
         state: enabled
         immediate: yes
       when: 
-        - "'firewalld' in ansible_facts.packages"
+        - firewalld_check.rc == 0
 
     - name: Ensure firewalld is restarted
       ansible.builtin.service: