diff --git a/tasks/main.yml b/tasks/main.yml
index 60374b3..c72dc5b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -111,8 +111,6 @@
 
 - name: capture /etc/password variables
   ansible.builtin.include_tasks: parse_etc_password.yml
-  when:
-      - rhel9cis_section6
   tags:
       - rule_5.5.2
       - rule_5.6.2
@@ -161,8 +159,7 @@
 
 - name: run auditd logic
   ansible.builtin.import_tasks: auditd.yml
-  when:
-      - update_audit_template
+  when: update_audit_template
   tags:
       - always
 
@@ -180,8 +177,7 @@
 - name: Show Audit Summary
   ansible.builtin.debug:
       msg: "{{ audit_results.split('\n') }}"
-  when:
-      - run_audit
+  when: run_audit
 
 - name: If Warnings found Output count and control IDs affected
   ansible.builtin.debug: