diff --git a/tasks/section_5/cis_5.5.x.yml b/tasks/section_5/cis_5.5.x.yml
index 10b18a7..3aaf27b 100644
--- a/tasks/section_5/cis_5.5.x.yml
+++ b/tasks/section_5/cis_5.5.x.yml
@@ -3,10 +3,14 @@
 - name: "5.5.1 | PATCH | "
   block:
       - name: "5.5.1 | PATCH | Ensure password creation requirements are configured | Set pwquality config settings"
-        blockinfile:
+        lineinfile:
             path: /etc/security/pwquality.conf
-            marker: "<!-- {mark} CIS 5.5.1 ANSIBLE MANAGED BLOCK -->"
-            block: "{{ rhel9cis_pam_password }}"
+            state: present
+            regexp: ^{{ item.name }}
+            line: "{{ item.name }} = {{ item.value }}"
+        with_items:
+            - { name: minlen, value: "{{ rhel9cis_pam_password.minlen }}" }
+            - { name: minclass, value: "{{ rhel9cis_pam_password.minclass }}" }
 
       - name: "5.5.1 | PATCH | Ensure password creation requirements are configured | Set system-auth retry settings"
         lineinfile: