diff --git a/tasks/main.yml b/tasks/main.yml
index c96e9e5..4435910 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -27,7 +27,7 @@
 - name: Check ansible version
   ansible.builtin.assert:
       that: ansible_version.full is version_compare(min_ansible_version, '>=')
-      msg: You must use Ansible {{ min_ansible_version }} or greater
+      fail_msg: You must use Ansible {{ min_ansible_version }} or greater
   tags:
       - always
 
diff --git a/tasks/section09.yml b/tasks/section09.yml
index 0dd5595..593afcf 100644
--- a/tasks/section09.yml
+++ b/tasks/section09.yml
@@ -115,7 +115,7 @@
 - name: "SCORED | 9.2.1 | PATCH | (L1) Ensure 'Windows Firewall: Private: Firewall state' is set to 'On (recommended)'"
   community.windows.win_firewall:
       state: enabled
-      profile: Private
+      profiles: Private
   when:
       - win16cis_rule_9_2_1
   tags:
@@ -226,7 +226,7 @@
 - name: "SCORED | 9.3.1 | PATCH | (L1) Ensure 'Windows Firewall: Public: Firewall state' is set to 'On (recommended)'"
   community.windows.win_firewall:
       state: enabled
-      profile: Public
+      profiles: Public
   when:
       - win16cis_rule_9_3_1
   tags:
diff --git a/tasks/section18.yml b/tasks/section18.yml
index e1af77f..eda7198 100644
--- a/tasks/section18.yml
+++ b/tasks/section18.yml
@@ -218,9 +218,9 @@
   ansible.windows.win_regedit:
       path: HKLM:\SYSTEM\CurrentControlSet\Services\NetBT\Parameters
       state: present
-      value: NodeType
+      name: NodeType
       data: 2
-      datatype: dword
+      type: dword
   when:
       - win16cis_rule_18_3_6
   tags:
@@ -233,9 +233,9 @@
   ansible.windows.win_regedit:
       path: HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\Wdigest
       state: present
-      value: UseLogonCredential
+      name: UseLogonCredential
       data: 0
-      datatype: dword
+      type: dword
   when:
       - win16cis_rule_18_3_7
   tags:
@@ -248,9 +248,9 @@
   ansible.windows.win_regedit:
       path: HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon
       state: present
-      value: AutoAdminLogon
+      name: AutoAdminLogon
       data: 0
-      datatype: string
+      type: string
   when:
       - win16cis_rule_18_4_1
   tags:
@@ -263,9 +263,9 @@
   ansible.windows.win_regedit:
       path: HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters
       state: present
-      value: DisableIPSourceRouting
+      name: DisableIPSourceRouting
       data: 2
-      datatype: dword
+      type: dword
   when:
       - win16cis_rule_18_4_2
   tags:
@@ -278,9 +278,9 @@
   ansible.windows.win_regedit:
       path: HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters
       state: present
-      value: DisableIPSourceRouting
+      name: DisableIPSourceRouting
       data: 2
-      datatype: dword
+      type: dword
   when:
       - win16cis_rule_18_4_3
   tags:
@@ -293,9 +293,9 @@
   ansible.windows.win_regedit:
       path: HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters
       state: present
-      value: EnableICMPRedirect
+      name: EnableICMPRedirect
       data: 0
-      datatype: dword
+      type: dword
   when:
       - win16cis_rule_18_4_4
   tags:
@@ -308,9 +308,9 @@
   ansible.windows.win_regedit:
       path: HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters
       state: present
-      value: KeepAliveTime
+      name: KeepAliveTime
       data: 300000
-      datatype: dword
+      type: dword
   when:
       - win16cis_rule_18_4_5
   tags: