diff --git a/tasks/section_5/cis_5.1.x.yml b/tasks/section_5/cis_5.1.x.yml
index 296ebf9..99176fd 100644
--- a/tasks/section_5/cis_5.1.x.yml
+++ b/tasks/section_5/cis_5.1.x.yml
@@ -6,7 +6,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - permissions
     - rule_5.1.1
     - NIST800-53R5_AC-3
@@ -23,7 +23,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - permissions
     - rule_5.1.2
     - NIST800-53R5_AC-3
@@ -53,7 +53,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.3
     - NIST800-53R5_AC-3
     - NIST800-53R5_MP-2
@@ -166,7 +166,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.7
     - NIST800-53R5_AC-3
     - NIST800-53R5_MP-2
@@ -195,6 +195,8 @@
         path: "{{ rhel9cis_sshd_config_file }}"
         regexp: "^DenyUsers"
         line: "DenyUsers {{ rhel9cis_sshd_denyusers }}"
+        insertbefore: "^Match"
+        firstmatch: true
         validate: sshd -t -f %s
       notify: Restart sshd
 
@@ -213,7 +215,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.8
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -231,7 +233,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.9
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -261,7 +263,7 @@
     - level2-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.10
     - NIST800-53R5_CM-7
   block:
@@ -287,7 +289,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - sshs
+    - sshd
     - rule_5.1.11
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -317,7 +319,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.12
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -337,7 +339,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.13
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -348,6 +350,8 @@
     path: "{{ rhel9cis_sshd_config_file }}"
     regexp: ^(?i)(#|)\s*IgnoreRhosts
     line: 'IgnoreRhosts yes'
+    insertbefore: "^Match"
+    firstmatch: true
     validate: sshd -t -f %s
   notify: Restart sshd
 
@@ -357,13 +361,15 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.14
     - NIST800-53R5_CM-6
   ansible.builtin.lineinfile:
     path: "{{ rhel9cis_sshd_config_file }}"
     regexp: ^(?i)(#|)\s*LoginGraceTime
     line: "LoginGraceTime {{ rhel9cis_sshd_logingracetime }}"
+    insertbefore: "^Match"
+    firstmatch: true
     validate: sshd -t -f %s
   notify: Restart sshd
 
@@ -373,7 +379,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - sshs
+    - sshd
     - rule_5.1.15
     - NIST800-53R5_AU-3
     - NIST800-53R5_AU-12
@@ -382,6 +388,8 @@
     path: "{{ rhel9cis_sshd_config_file }}"
     regexp: ^(?i)(#|)\s*LogLevel
     line: 'LogLevel {{ rhel9cis_ssh_loglevel }}'
+    insertbefore: "^Match"
+    firstmatch: true
     validate: sshd -t -f %s
   notify: Restart sshd
 
@@ -391,7 +399,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.16
     - NIST800-53R5_AU-3
   ansible.builtin.lineinfile:
@@ -407,7 +415,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.17
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -427,7 +435,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.18
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -447,7 +455,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.19
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -467,7 +475,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.20
     - NIST800-53R5_AC-6
   block:
@@ -491,7 +499,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.21
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2
@@ -511,7 +519,7 @@
     - level1-server
     - level1-workstation
     - patch
-    - ssh
+    - sshd
     - rule_5.1.22
     - NIST800-53R5_CM-1
     - NIST800-53R5_CM-2