diff --git a/tasks/section01.yml b/tasks/section01.yml
index 1d9aa7b..4e6a0bc 100644
--- a/tasks/section01.yml
+++ b/tasks/section01.yml
@@ -1,5 +1,4 @@
 ---
-
 - name: "1.1.1 | PATCH | Ensure Enforce password history is set to 24 or more passwords."
   block:
       - name: "1.1.1 | AUDIT | Ensure Enforce password history is set to 24 or more passwords. | Check for more than 24 saved passwords warning."
@@ -155,10 +154,11 @@
       - password
 
 - name: "1.1.6 | PATCH | Ensure Relax minimum password length limits is set to Enabled."
-  community.windows.win_security_policy:
-      section: System Access
-      key: RelaxMinimumPasswordLengthLimits
-      value: 1
+  ansible.windows.win_regedit:
+      path: HKLM:\System\CurrentControlSet\Control\SAM
+      name: RelaxMinimumPasswordLengthLimits
+      data: 1
+      type: dword
   when:
       - win22cis_rule_1_1_6
   tags:
diff --git a/tasks/section18.yml b/tasks/section18.yml
index 2e53b69..82cc641 100644
--- a/tasks/section18.yml
+++ b/tasks/section18.yml
@@ -607,9 +607,9 @@
   when:
       - win22cis_rule_18_6_4_3
   tags:
-      - level1-domaincontroller
-      - level1-memberserver
+      - level1-corporate-enterprise-environment
       - rule_18.6.4.3
+      - automated
       - patch
       - dns