ubuntu2204: cis_level1_server: Add cis references

alanmcanonical · Dec 14, 2022 · 97e3738 · 97e3738
1 parent d5dc4c4
commit 97e3738
Show file tree

Hide file tree

Showing 185 changed files with 193 additions and 122 deletions.
diff --git a/linux_os/guide/services/apport/service_apport_disabled/rule.yml b/linux_os/guide/services/apport/service_apport_disabled/rule.yml
@@ -17,6 +17,9 @@ rationale: |-
 
 severity: unknown
 
+references:
+    cis@ubuntu2204: 1.5.3
+
 template:
     name: service_disabled
     vars:

diff --git a/linux_os/guide/services/avahi/disable_avahi_group/service_avahi-daemon_disabled/rule.yml b/linux_os/guide/services/avahi/disable_avahi_group/service_avahi-daemon_disabled/rule.yml
@@ -31,7 +31,7 @@ references:
     cis@sle12: 2.2.3
     cis@sle15: 2.2.3
     cis@ubuntu2004: 2.2.3
-    cis@ubuntu2204: 2.2.3
+    cis@ubuntu2204: 2.2.2
     cobit5: BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS05.02,DSS05.05,DSS06.06
     disa: CCI-000366
     isa-62443-2009: 4.3.3.5.1,4.3.3.5.2,4.3.3.5.3,4.3.3.5.4,4.3.3.5.5,4.3.3.5.6,4.3.3.5.7,4.3.3.5.8,4.3.3.6.1,4.3.3.6.2,4.3.3.6.3,4.3.3.6.4,4.3.3.6.5,4.3.3.6.6,4.3.3.6.7,4.3.3.6.8,4.3.3.6.9,4.3.3.7.1,4.3.3.7.2,4.3.3.7.3,4.3.3.7.4,4.3.4.3.2,4.3.4.3.3

diff --git a/linux_os/guide/services/cron_and_at/restrict_at_cron_users/file_at_deny_not_exist/rule.yml b/linux_os/guide/services/cron_and_at/restrict_at_cron_users/file_at_deny_not_exist/rule.yml
@@ -29,6 +29,7 @@ references:
     cis@rhel8: 5.1.9
     cis@sle12: 5.1.9
     cis@sle15: 5.1.9
+    cis@ubuntu2204: 5.1.9
 
 ocil_clause: 'the file /etc/at.deny exists'
 

diff --git a/linux_os/guide/services/cron_and_at/restrict_at_cron_users/file_cron_deny_not_exist/rule.yml b/linux_os/guide/services/cron_and_at/restrict_at_cron_users/file_cron_deny_not_exist/rule.yml
@@ -29,6 +29,7 @@ references:
     cis@rhel8: 5.1.8
     cis@sle12: 5.1.8
     cis@sle15: 5.1.8
+    cis@ubuntu2204: 5.1.8
 
 ocil_clause: 'the file /etc/cron.deny exists'
 

diff --git a/linux_os/guide/services/deprecated/package_nis_removed/rule.yml b/linux_os/guide/services/deprecated/package_nis_removed/rule.yml
@@ -12,7 +12,7 @@ severity: low
 
 references:
     cis@ubuntu2004: 2.2.17
-    cis@ubuntu2204: 2.2.17
+    cis@ubuntu2204: 2.2.14
 
 template:
     name: package_removed

diff --git a/linux_os/guide/services/dhcp/disabling_dhcp_server/package_dhcp_removed/rule.yml b/linux_os/guide/services/dhcp/disabling_dhcp_server/package_dhcp_removed/rule.yml
@@ -27,15 +27,15 @@ identifiers:
     cce@rhel9: CCE-84240-1
     cce@sle12: CCE-91453-1
     cce@sle15: CCE-85759-9
-    
+
 references:
     anssi: BP28(R1)
     cis-csc: 11,14,3,9
     cis@rhel7: 2.2.5
     cis@sle12: 2.2.5
     cis@sle15: 2.2.5
     cis@ubuntu2004: 2.2.5
-    cis@ubuntu2204: 2.2.5
+    cis@ubuntu2204: 2.2.4
     cobit5: BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS05.02,DSS05.05,DSS06.06
     disa: CCI-000366
     isa-62443-2009: 4.3.3.5.1,4.3.3.5.2,4.3.3.5.3,4.3.3.5.4,4.3.3.5.5,4.3.3.5.6,4.3.3.5.7,4.3.3.5.8,4.3.3.6.1,4.3.3.6.2,4.3.3.6.3,4.3.3.6.4,4.3.3.6.5,4.3.3.6.6,4.3.3.6.7,4.3.3.6.8,4.3.3.6.9,4.3.3.7.1,4.3.3.7.2,4.3.3.7.3,4.3.3.7.4,4.3.4.3.2,4.3.4.3.3

diff --git a/linux_os/guide/services/dns/disabling_dns_server/package_bind_removed/rule.yml b/linux_os/guide/services/dns/disabling_dns_server/package_bind_removed/rule.yml
@@ -26,7 +26,7 @@ references:
     cis@sle12: 2.2.9
     cis@sle15: 2.2.9
     cis@ubuntu2004: 2.2.8
-    cis@ubuntu2204: 2.2.8
+    cis@ubuntu2204: 2.2.7
     cobit5: BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS05.02,DSS05.05,DSS06.06
     disa: CCI-000366
     isa-62443-2009: 4.3.3.5.1,4.3.3.5.2,4.3.3.5.3,4.3.3.5.4,4.3.3.5.5,4.3.3.5.6,4.3.3.5.7,4.3.3.5.8,4.3.3.6.1,4.3.3.6.2,4.3.3.6.3,4.3.3.6.4,4.3.3.6.5,4.3.3.6.6,4.3.3.6.7,4.3.3.6.8,4.3.3.6.9,4.3.3.7.1,4.3.3.7.2,4.3.3.7.3,4.3.3.7.4,4.3.4.3.2,4.3.4.3.3

diff --git a/linux_os/guide/services/ftp/disabling_vsftpd/package_vsftpd_removed/rule.yml b/linux_os/guide/services/ftp/disabling_vsftpd/package_vsftpd_removed/rule.yml
@@ -26,7 +26,7 @@ references:
     cis@sle12: 2.2.10
     cis@sle15: 2.2.10
     cis@ubuntu2004: 2.2.9
-    cis@ubuntu2204: 2.2.9
+    cis@ubuntu2204: 2.2.8
     cobit5: BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS05.02,DSS05.05,DSS06.06
     disa: CCI-000197,CCI-000366,CCI-000381
     isa-62443-2009: 4.3.3.5.1,4.3.3.5.2,4.3.3.5.3,4.3.3.5.4,4.3.3.5.5,4.3.3.5.6,4.3.3.5.7,4.3.3.5.8,4.3.3.6.1,4.3.3.6.2,4.3.3.6.3,4.3.3.6.4,4.3.3.6.5,4.3.3.6.6,4.3.3.6.7,4.3.3.6.8,4.3.3.6.9,4.3.3.7.1,4.3.3.7.2,4.3.3.7.3,4.3.3.7.4,4.3.4.3.2,4.3.4.3.3

diff --git a/linux_os/guide/services/http/disabling_httpd/package_httpd_removed/rule.yml b/linux_os/guide/services/http/disabling_httpd/package_httpd_removed/rule.yml
@@ -31,7 +31,7 @@ references:
     cis@sle12: 2.2.11
     cis@sle15: 2.2.11
     cis@ubuntu2004: 2.2.10
-    cis@ubuntu2204: 2.2.10
+    cis@ubuntu2204: 2.2.9
     cobit5: BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS05.02,DSS05.05,DSS06.06
     isa-62443-2009: 4.3.3.5.1,4.3.3.5.2,4.3.3.5.3,4.3.3.5.4,4.3.3.5.5,4.3.3.5.6,4.3.3.5.7,4.3.3.5.8,4.3.3.6.1,4.3.3.6.2,4.3.3.6.3,4.3.3.6.4,4.3.3.6.5,4.3.3.6.6,4.3.3.6.7,4.3.3.6.8,4.3.3.6.9,4.3.3.7.1,4.3.3.7.2,4.3.3.7.3,4.3.3.7.4,4.3.4.3.2,4.3.4.3.3
     isa-62443-2013: 'SR 1.1,SR 1.10,SR 1.11,SR 1.12,SR 1.13,SR 1.2,SR 1.3,SR 1.4,SR 1.5,SR 1.6,SR 1.7,SR 1.8,SR 1.9,SR 2.1,SR 2.2,SR 2.3,SR 2.4,SR 2.5,SR 2.6,SR 2.7,SR 7.6'

diff --git a/linux_os/guide/services/imap/disabling_dovecot/package_dovecot_removed/rule.yml b/linux_os/guide/services/imap/disabling_dovecot/package_dovecot_removed/rule.yml
@@ -31,7 +31,7 @@ references:
     cis@sle12: 2.2.12
     cis@sle15: 2.2.12
     cis@ubuntu2004: 2.2.11
-    cis@ubuntu2204: 2.2.11
+    cis@ubuntu2204: 2.2.10
 
 {{% if 'ubuntu' not in product %}}
 {{{ complete_ocil_entry_package(package="dovecot") }}}

diff --git a/linux_os/guide/services/ldap/openldap_server/package_openldap-servers_removed/rule.yml b/linux_os/guide/services/ldap/openldap_server/package_openldap-servers_removed/rule.yml
@@ -33,7 +33,7 @@ references:
     cis@sle12: 2.2.6
     cis@sle15: 2.2.6
     cis@ubuntu2004: 2.2.6
-    cis@ubuntu2204: 2.2.6
+    cis@ubuntu2204: 2.2.5
     cobit5: BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS05.02,DSS05.05,DSS06.06
     disa: CCI-000366
     isa-62443-2009: 4.3.3.5.1,4.3.3.5.2,4.3.3.5.3,4.3.3.5.4,4.3.3.5.5,4.3.3.5.6,4.3.3.5.7,4.3.3.5.8,4.3.3.6.1,4.3.3.6.2,4.3.3.6.3,4.3.3.6.4,4.3.3.6.5,4.3.3.6.6,4.3.3.6.7,4.3.3.6.8,4.3.3.6.9,4.3.3.7.1,4.3.3.7.2,4.3.3.7.3,4.3.3.7.4,4.3.4.3.2,4.3.4.3.3

diff --git a/linux_os/guide/services/mail/postfix_client/postfix_network_listening_disabled/rule.yml b/linux_os/guide/services/mail/postfix_client/postfix_network_listening_disabled/rule.yml
@@ -32,6 +32,7 @@ references:
     cis@rhel8: 2.2.17
     cis@sle12: 2.2.16
     cis@sle15: 2.2.16
+    cis@ubuntu2204: 2.2.15
     cobit5: BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS05.02,DSS05.05,DSS06.06
     disa: CCI-000382
     isa-62443-2009: 4.3.3.5.1,4.3.3.5.2,4.3.3.5.3,4.3.3.5.4,4.3.3.5.5,4.3.3.5.6,4.3.3.5.7,4.3.3.5.8,4.3.3.6.1,4.3.3.6.2,4.3.3.6.3,4.3.3.6.4,4.3.3.6.5,4.3.3.6.6,4.3.3.6.7,4.3.3.6.8,4.3.3.6.9,4.3.3.7.1,4.3.3.7.2,4.3.3.7.3,4.3.3.7.4,4.3.4.3.2,4.3.4.3.3

diff --git a/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/rule.yml b/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/rule.yml
@@ -49,7 +49,7 @@ references:
     cis@sle12: 2.2.1.3
     cis@sle15: 2.2.1.3
     cis@ubuntu2004: 2.2.1.3
-    cis@ubuntu2204: 2.2.1.3
+    cis@ubuntu2204: 2.1.2.2
 
 
 

diff --git a/linux_os/guide/services/ntp/ntpd_configure_restrictions/rule.yml b/linux_os/guide/services/ntp/ntpd_configure_restrictions/rule.yml
@@ -27,6 +27,7 @@ references:
     cis@alinux2: 2.1.1.2
     cis@rhel7: 2.2.1.3
     cis@sle12: 2.2.1.4
+    cis@ubuntu2204: 2.1.4.1
 
 identifiers:
     cce@rhel7: CCE-84299-7

diff --git a/linux_os/guide/services/ntp/ntpd_run_as_ntp_user/rule.yml b/linux_os/guide/services/ntp/ntpd_run_as_ntp_user/rule.yml
@@ -28,6 +28,7 @@ references:
     cis@alinux2: 2.1.1.2
     cis@rhel7: 2.2.1.3
     cis@sle12: 2.2.1.4
+    cis@ubuntu2204: 2.1.4.3
 
 identifiers:
     cce@rhel7: CCE-84295-5

diff --git a/linux_os/guide/services/ntp/package_chrony_installed/rule.yml b/linux_os/guide/services/ntp/package_chrony_installed/rule.yml
@@ -32,7 +32,7 @@ references:
     cis@sle12: 2.2.1.1
     cis@sle15: 2.2.1.1
     cis@ubuntu2004: 2.2.1.1
-    cis@ubuntu2204: 2.2.1.1
+    cis@ubuntu2204: 2.1.1.1
     ism: 0988,1405
     ospp: FMT_SMF_EXT.1
     pcidss: Req-10.6.1

diff --git a/linux_os/guide/services/ntp/service_ntp_enabled/rule.yml b/linux_os/guide/services/ntp/service_ntp_enabled/rule.yml
@@ -27,7 +27,7 @@ references:
     anssi: NT012(R03)
     cis-csc: 1,14,15,16,3,5,6
     cis@ubuntu2004: 2.2.1.4
-    cis@ubuntu2204: 2.2.1.4
+    cis@ubuntu2204: 2.1.4.4
     cobit5: APO11.04,BAI03.05,DSS05.04,DSS05.07,MEA02.01
     disa: CCI-000160
     isa-62443-2009: 4.3.3.3.9,4.3.3.5.8,4.3.4.4.7,4.4.2.1,4.4.2.2,4.4.2.4

diff --git a/linux_os/guide/services/obsolete/r_services/no_rsh_trust_files/rule.yml b/linux_os/guide/services/obsolete/r_services/no_rsh_trust_files/rule.yml
@@ -34,7 +34,7 @@ references:
     cis@sle12: 6.2.12
     cis@sle15: 6.2.12
     cis@ubuntu2004: 6.2.11
-    cis@ubuntu2204: 6.2.11
+    cis@ubuntu2204: 6.2.16
     cobit5: APO13.01,BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS01.04,DSS05.02,DSS05.03,DSS05.05,DSS06.06
     disa: CCI-001436
     hipaa: 164.308(a)(4)(i),164.308(b)(1),164.308(b)(3),164.310(b),164.312(e)(1),164.312(e)(2)(ii)

diff --git a/linux_os/guide/services/printing/service_cups_disabled/rule.yml b/linux_os/guide/services/printing/service_cups_disabled/rule.yml
@@ -26,7 +26,7 @@ references:
     cis@sle12: 2.2.4
     cis@sle15: 2.2.4
     cis@ubuntu2004: 2.2.4
-    cis@ubuntu2204: 2.2.4
+    cis@ubuntu2204: 2.2.3
     cobit5: BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS05.02,DSS05.05,DSS06.06
     isa-62443-2009: 4.3.3.5.1,4.3.3.5.2,4.3.3.5.3,4.3.3.5.4,4.3.3.5.5,4.3.3.5.6,4.3.3.5.7,4.3.3.5.8,4.3.3.6.1,4.3.3.6.2,4.3.3.6.3,4.3.3.6.4,4.3.3.6.5,4.3.3.6.6,4.3.3.6.7,4.3.3.6.8,4.3.3.6.9,4.3.3.7.1,4.3.3.7.2,4.3.3.7.3,4.3.3.7.4,4.3.4.3.2,4.3.4.3.3
     isa-62443-2013: 'SR 1.1,SR 1.10,SR 1.11,SR 1.12,SR 1.13,SR 1.2,SR 1.3,SR 1.4,SR 1.5,SR 1.6,SR 1.7,SR 1.8,SR 1.9,SR 2.1,SR 2.2,SR 2.3,SR 2.4,SR 2.5,SR 2.6,SR 2.7,SR 7.6'

diff --git a/linux_os/guide/services/proxy/disabling_squid/package_squid_removed/rule.yml b/linux_os/guide/services/proxy/disabling_squid/package_squid_removed/rule.yml
@@ -27,7 +27,7 @@ references:
     cis@sle12: 2.2.14
     cis@sle15: 2.2.14
     cis@ubuntu2004: 2.2.13
-    cis@ubuntu2204: 2.2.13
+    cis@ubuntu2204: 2.2.12
 
 template:
     name: package_removed

diff --git a/linux_os/guide/services/smb/disabling_samba/package_samba_removed/rule.yml b/linux_os/guide/services/smb/disabling_samba/package_samba_removed/rule.yml
@@ -25,7 +25,7 @@ references:
     cis@sle12: 2.2.13
     cis@sle15: 2.2.13
     cis@ubuntu2004: 2.2.12
-    cis@ubuntu2204: 2.2.12
+    cis@ubuntu2204: 2.2.11
 
 {{{ complete_ocil_entry_package(package="samba") }}}
 

diff --git a/linux_os/guide/services/snmp/disabling_snmp_service/package_net-snmp_removed/rule.yml b/linux_os/guide/services/snmp/disabling_snmp_service/package_net-snmp_removed/rule.yml
@@ -33,7 +33,7 @@ references:
     cis@sle12: 2.2.15
     cis@sle15: 2.2.15
     cis@ubuntu2004: 2.2.14
-    cis@ubuntu2204: 2.2.14
+    cis@ubuntu2204: 2.2.13
 
 {{% if pkg_manager != "apt_get" %}}
 {{{ complete_ocil_entry_package(package="net-snmp") }}}

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_disable_empty_passwords/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_disable_empty_passwords/rule.yml
@@ -39,7 +39,7 @@ references:
     cis@sle12: 5.2.11
     cis@sle15: 5.2.11
     cis@ubuntu2004: 5.2.10
-    cis@ubuntu2204: 5.2.10
+    cis@ubuntu2204: 5.2.9
     cjis: 5.5.6
     cobit5: APO01.06,BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS05.02,DSS05.04,DSS05.05,DSS05.07,DSS06.02,DSS06.03,DSS06.06
     cui: 3.1.1,3.1.5

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_disable_rhosts/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_disable_rhosts/rule.yml
@@ -37,7 +37,7 @@ references:
     cis@sle12: 5.2.8
     cis@sle15: 5.2.8
     cis@ubuntu2004: 5.2.7
-    cis@ubuntu2204: 5.2.7
+    cis@ubuntu2204: 5.2.11
     cjis: 5.5.6
     cobit5: BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS05.02,DSS05.04,DSS05.05,DSS05.07,DSS06.03,DSS06.06
     cui: 3.1.12

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_disable_root_login/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_disable_root_login/rule.yml
@@ -35,7 +35,7 @@ references:
     cis@sle12: 5.2.10
     cis@sle15: 5.2.10
     cis@ubuntu2004: 5.2.9
-    cis@ubuntu2204: 5.2.9
+    cis@ubuntu2204: 5.2.7
     cjis: 5.5.6
     cobit5: APO01.06,DSS05.02,DSS05.04,DSS05.05,DSS05.07,DSS05.10,DSS06.02,DSS06.03,DSS06.06,DSS06.10
     cui: '3.1.1,3.1.5'

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_do_not_permit_user_env/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_do_not_permit_user_env/rule.yml
@@ -34,7 +34,7 @@ references:
     cis@sle12: 5.2.12
     cis@sle15: 5.2.12
     cis@ubuntu2004: 5.2.11
-    cis@ubuntu2204: 5.2.11
+    cis@ubuntu2204: 5.2.10
     cjis: 5.5.6
     cobit5: BAI10.01,BAI10.02,BAI10.03,BAI10.05
     cui: 3.1.12

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_enable_pam/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_enable_pam/rule.yml
@@ -33,7 +33,7 @@ references:
     cis@sle12: 5.2.19
     cis@sle15: 5.2.19
     cis@ubuntu2004: 5.2.19
-    cis@ubuntu2204: 5.2.19
+    cis@ubuntu2204: 5.2.6
     disa: CCI-000877
     srg: SRG-OS-000125-GPOS-00065
     stigid@ubuntu2004: UBTU-20-010035

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_enable_warning_banner_net/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_enable_warning_banner_net/rule.yml
@@ -24,7 +24,7 @@ severity: medium
 
 references:
     cis@ubuntu2004: 5.2.18
-    cis@ubuntu2204: 5.2.18
+    cis@ubuntu2204: 5.2.17
     cjis: 5.5.6
     cobit5: DSS05.04,DSS05.10,DSS06.10
     cui: 3.1.9

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_set_idle_timeout/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_idle_timeout/rule.yml
@@ -42,7 +42,7 @@ references:
     cis@sle12: 5.2.16
     cis@sle15: 5.2.16
     cis@ubuntu2004: 5.2.15
-    cis@ubuntu2204: 5.2.15
+    cis@ubuntu2204: 5.2.22
     cjis: 5.5.6
     cobit5: APO13.01,BAI03.01,BAI03.02,BAI03.03,DSS01.03,DSS03.05,DSS05.04,DSS05.05,DSS05.07,DSS05.10,DSS06.03,DSS06.10
     cui: 3.1.11

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_set_keepalive/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_keepalive/rule.yml
@@ -41,7 +41,7 @@ references:
     cis@sle12: 5.3.17
     cis@sle15: 5.3.16
     cis@ubuntu2004: 5.2.15
-    cis@ubuntu2204: 5.2.15
+    cis@ubuntu2204: 5.2.22
     cjis: 5.5.6
     cobit5: APO13.01,BAI03.01,BAI03.02,BAI03.03,DSS01.03,DSS03.05,DSS05.04,DSS05.05,DSS05.07,DSS05.10,DSS06.03,DSS06.10
     cui: 3.1.11

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_set_login_grace_time/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_login_grace_time/rule.yml
@@ -29,6 +29,7 @@ references:
     cis@rhel8: 5.2.19
     cis@sle12: 5.2.17
     cis@sle15: 5.2.17
+    cis@ubuntu2204: 5.2.21
 
 ocil_clause: 'it is commented out or not configured properly'
 

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_set_loglevel_info/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_loglevel_info/rule.yml
@@ -39,7 +39,7 @@ references:
     cis@sle12: 5.2.5
     cis@sle15: 5.2.5
     cis@ubuntu2004: 5.2.4
-    cis@ubuntu2204: 5.2.4
+    cis@ubuntu2204: 5.2.5
     nist: AC-17(a),CM-6(a)
 
 {{{ complete_ocil_entry_sshd_option(default="yes", option="LogLevel", value="INFO") }}}

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_set_max_auth_tries/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_max_auth_tries/rule.yml
@@ -30,7 +30,7 @@ references:
     cis@sle12: 5.2.7
     cis@sle15: 5.2.7
     cis@ubuntu2004: 5.2.6
-    cis@ubuntu2204: 5.2.6
+    cis@ubuntu2204: 5.2.18
     ism: 0421,0422,0431,0974,1173,1401,1504,1505,1546,1557,1558,1559,1560,1561
 
 ocil_clause: 'it is commented out or not configured properly'

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_set_max_sessions/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_max_sessions/rule.yml
@@ -27,7 +27,7 @@ references:
     cis@sle12: 5.2.22
     cis@sle15: 5.2.22
     cis@ubuntu2004: 5.2.22
-    cis@ubuntu2204: 5.2.22
+    cis@ubuntu2204: 5.2.20
 
 ocil_clause: "MaxSessions is not configured or not configured correctly"
 

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_set_maxstartups/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_maxstartups/rule.yml
@@ -33,7 +33,7 @@ references:
     cis@sle12: 5.2.21
     cis@sle15: 5.2.21
     cis@ubuntu2004: 5.2.21
-    cis@ubuntu2204: 5.2.21
+    cis@ubuntu2204: 5.2.19
 
 ocil_clause: 'maxstartups is not configured'
 

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_ciphers/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_ciphers/rule.yml
@@ -59,7 +59,7 @@ references:
     cis@sle12: 5.2.13
     cis@sle15: 5.2.13
     cis@ubuntu2004: 5.2.12
-    cis@ubuntu2204: 5.2.12
+    cis@ubuntu2204: 5.2.13
     cjis: 5.5.6
     cobit5: APO11.04,APO13.01,BAI03.05,BAI10.01,BAI10.02,BAI10.03,BAI10.05,DSS01.04,DSS05.02,DSS05.03,DSS05.04,DSS05.05,DSS05.07,DSS05.10,DSS06.03,DSS06.06,DSS06.10,MEA02.01
     cui: 3.1.13,3.13.11,3.13.8

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs/rule.yml
@@ -53,7 +53,7 @@ references:
     cis@sle12: 5.2.14
     cis@sle15: 5.2.14
     cis@ubuntu2004: 5.2.13
-    cis@ubuntu2204: 5.2.13
+    cis@ubuntu2204: 5.2.14
     cobit5: APO01.06,APO13.01,DSS01.04,DSS05.02,DSS05.03,DSS05.04,DSS05.07,DSS06.02,DSS06.03
     cui: 3.1.13,3.13.11,3.13.8
     disa: CCI-000068,CCI-000803,CCI-000877,CCI-001453,CCI-003123

diff --git a/...uide/services/xwindows/disabling_xwindows/package_xorg-x11-server-common_removed/rule.yml b/...uide/services/xwindows/disabling_xwindows/package_xorg-x11-server-common_removed/rule.yml
@@ -38,7 +38,7 @@ references:
     cis@sle12: 2.2.2
     cis@sle15: 2.2.2
     cis@ubuntu2004: 2.2.2
-    cis@ubuntu2204: 2.2.2
+    cis@ubuntu2204: 2.2.1
     cobit5: APO13.01,DSS01.04,DSS05.02,DSS05.03
     disa: CCI-000366
     isa-62443-2009: 4.3.3.6.6

diff --git a/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/rule.yml b/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/rule.yml
@@ -102,6 +102,7 @@ references:
     cis@rhel8: 1.7.2
     cis@sle12: 1.8.1.2
     cis@sle15: 1.8.1.2
+    cis@ubuntu2204: 1.7.2
     cobit5: DSS05.04,DSS05.10,DSS06.10
     cui: 3.1.9
     disa: CCI-000048,CCI-000050,CCI-001384,CCI-001385,CCI-001386,CCI-001387,CCI-001388

diff --git a/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue_net/rule.yml b/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue_net/rule.yml
@@ -60,6 +60,7 @@ references:
     cis@rhel8: 1.7.3
     cis@sle12: 1.8.1.3
     cis@sle15: 1.8.1.3
+    cis@ubuntu2204: 1.7.3
     disa: CCI-000048,CCI-001384,CCI-001385,CCI-001386,CCI-001387,CCI-001388
     srg: SRG-OS-000023-GPOS-00006,SRG-OS-000228-GPOS-00088
     stigid@ubuntu2004: UBTU-20-010038

diff --git a/linux_os/guide/system/accounts/accounts-banners/file_groupowner_etc_issue/rule.yml b/linux_os/guide/system/accounts/accounts-banners/file_groupowner_etc_issue/rule.yml
@@ -30,7 +30,7 @@ references:
     cis@sle12: 1.8.1.5
     cis@sle15: 1.8.1.5
     cis@ubuntu2004: 1.8.1.5
-    cis@ubuntu2204: 1.8.1.5
+    cis@ubuntu2204: 1.7.5
 
 ocil_clause: '{{{ ocil_clause_file_group_owner(file="/etc/issue", group="root") }}}'
 

diff --git a/linux_os/guide/system/accounts/accounts-banners/file_groupowner_etc_issue_net/rule.yml b/linux_os/guide/system/accounts/accounts-banners/file_groupowner_etc_issue_net/rule.yml
@@ -28,6 +28,7 @@ references:
     cis@rhel8: 1.7.6
     cis@sle12: 1.8.1.6
     cis@sle15: 1.8.1.6
+    cis@ubuntu2204: 1.7.6
 
 ocil_clause: '{{{ ocil_clause_file_group_owner(file="/etc/issue.net", group="root") }}}'
 

diff --git a/linux_os/guide/system/accounts/accounts-banners/file_groupowner_etc_motd/rule.yml b/linux_os/guide/system/accounts/accounts-banners/file_groupowner_etc_motd/rule.yml
@@ -30,7 +30,7 @@ references:
     cis@sle12: 1.8.1.4
     cis@sle15: 1.8.1.4
     cis@ubuntu2004: 1.8.1.4
-    cis@ubuntu2204: 1.8.1.4
+    cis@ubuntu2204: 1.7.4
 
 ocil_clause: '{{{ ocil_clause_file_group_owner(file="/etc/motd", group="root") }}}'
 

diff --git a/linux_os/guide/system/accounts/accounts-banners/file_owner_etc_issue/rule.yml b/linux_os/guide/system/accounts/accounts-banners/file_owner_etc_issue/rule.yml
@@ -30,7 +30,7 @@ references:
     cis@sle12: 1.8.1.5
     cis@sle15: 1.8.1.5
     cis@ubuntu2004: 1.8.1.5
-    cis@ubuntu2204: 1.8.1.5
+    cis@ubuntu2204: 1.7.5
 
 ocil_clause: '{{{ ocil_clause_file_owner(file="/etc/issue", owner="root") }}}'