diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/no_nullok.pass.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/no_nullok.pass.sh
index d1bfb5fc8de..dafe95c41cb 100644
--- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/no_nullok.pass.sh
+++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/no_nullok.pass.sh
@@ -32,7 +32,7 @@ Password-Initial:
 	[success=end default=ignore]	pam_unix.so obscure yescrypt
 EOF
 
-DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix
+DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix --disable unix
 
 rm "$config_file"
 
diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/nullok_commented.pass.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/nullok_commented.pass.sh
index 9c2ed1c87f2..1c5b413786d 100644
--- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/nullok_commented.pass.sh
+++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/nullok_commented.pass.sh
@@ -32,7 +32,7 @@ Password-Initial:
 	[success=end default=ignore]	pam_unix.so obscure yescrypt # nullok
 EOF
 
-DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix
+DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix --disable unix
 
 rm "$config_file"
 
diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/nullok_present.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/nullok_present.fail.sh
index c9747ba0718..3b9884ff0d9 100644
--- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/nullok_present.fail.sh
+++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/nullok_present.fail.sh
@@ -32,7 +32,7 @@ Password-Initial:
 	[success=end default=ignore]	pam_unix.so obscure yescrypt nullok
 EOF
 
-DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix
+DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix --disable unix
 
 rm "$config_file"
 {{% else %}}
diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/no_nullok.pass.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/no_nullok.pass.sh
index e42ef8d2bf7..2fa39db47c4 100644
--- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/no_nullok.pass.sh
+++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/no_nullok.pass.sh
@@ -6,7 +6,6 @@ config_file=/usr/share/pam-configs/tmp_unix
 
 cat << EOF > "$config_file"
 Name: Unix authentication
-Conflicts: unix
 Default: yes
 Priority: 257
 Conflicts: unix
@@ -32,6 +31,6 @@ Password-Initial:
 	[success=end default=ignore]	pam_unix.so obscure yescrypt
 EOF
 
-DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix
+DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix --disable unix
 
 rm "$config_file"
diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/nullok_commented.pass.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/nullok_commented.pass.sh
index 24ed3c87a34..9fbef083158 100644
--- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/nullok_commented.pass.sh
+++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/nullok_commented.pass.sh
@@ -6,7 +6,6 @@ config_file=/usr/share/pam-configs/tmp_unix
 
 cat << EOF > "$config_file"
 Name: Unix authentication
-Conflicts: unix
 Default: yes
 Priority: 257
 Conflicts: unix
@@ -32,6 +31,6 @@ Password-Initial:
 	[success=end default=ignore]	pam_unix.so obscure yescrypt # nullok
 EOF
 
-DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix
+DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix --disable unix
 
 rm "$config_file"
diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/nullok_present.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/nullok_present.fail.sh
index 15e92a05b8f..d1b351a3acd 100644
--- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/nullok_present.fail.sh
+++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_unix/tests/nullok_present.fail.sh
@@ -6,7 +6,6 @@ config_file=/usr/share/pam-configs/tmp_unix
 
 cat << EOF > "$config_file"
 Name: Unix authentication
-Conflicts: unix
 Default: yes
 Priority: 257
 Conflicts: unix
@@ -32,7 +31,7 @@ Password-Initial:
 	[success=end default=ignore]	pam_unix.so obscure yescrypt nullok
 EOF
 
-DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix
+DEBIAN_FRONTEND=noninteractive pam-auth-update --enable tmp_unix --disable unix
 
 rm "$config_file"
 
diff --git a/shared/macros/10-bash.jinja b/shared/macros/10-bash.jinja
index 801ca354de7..358b23d0582 100644
--- a/shared/macros/10-bash.jinja
+++ b/shared/macros/10-bash.jinja
@@ -975,9 +975,10 @@ if [ ! -f "$conf_path"/"$conf_name" ]; then
         if grep -q "$(md5sum "$conf_path"/unix | cut -d ' ' -f 1)" /var/lib/dpkg/info/libpam-runtime.md5sums;then
             cp "$conf_path"/unix "$conf_path"/"$conf_name"
             chmod 0644 "$conf_path"/"$conf_name"
+            sed -i 's/^Name: .*/Name: Unix authentication (ComplianceAsCode)/' "$conf_path"/"$conf_name"
             sed -i 's/Priority: [0-9]\+/Priority: 257\
 Conflicts: unix/' "$conf_path"/"$conf_name"
-            DEBIAN_FRONTEND=noninteractive pam-auth-update
+            DEBIAN_FRONTEND=noninteractive pam-auth-update --enable "$conf_name" --disable unix
         else
             echo "Not applicable - checksum of $conf_path/unix does not match the original." >&2
         fi