diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_groupownership/oval/shared.xml b/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_groupownership/oval/shared.xml
index eb4774983738..180ded56be55 100644
--- a/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_groupownership/oval/shared.xml
+++ b/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_groupownership/oval/shared.xml
@@ -8,22 +8,18 @@
- nobody
+ .*
state_accounts_users_home_files_groupownership_interactive_gids
-{{%- if product == 'rhel7' %}}
- state_accounts_users_home_files_groupownership_nfsnobody
-{{%- endif %}}
+ state_accounts_users_home_files_groupownership_user_list
{{{ gid_min }}}
-{{%- if product == 'rhel7' %}}
-
- nfsnobody
+
+ ^{{{ user_list }}}$
-{{%- endif %}}
diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_ownership/oval/shared.xml b/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_ownership/oval/shared.xml
index 503cc5daf7a9..72becc081297 100644
--- a/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_ownership/oval/shared.xml
+++ b/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_ownership/oval/shared.xml
@@ -8,22 +8,18 @@
- nobody
+ .*
state_accounts_users_home_files_ownership_interactive_uids
-{{%- if product == 'rhel7' %}}
- state_accounts_users_home_files_ownership_nfsnobody
-{{%- endif %}}
+ state_accounts_users_home_files_ownership_user_list
{{{ uid_min }}}
-{{%- if product == 'rhel7' %}}
-
- nfsnobody
+
+ ^{{{ user_list }}}$
-{{%- endif %}}
diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_permissions/oval/shared.xml b/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_permissions/oval/shared.xml
index 1763f789ca47..39128ccea20a 100644
--- a/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_permissions/oval/shared.xml
+++ b/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_permissions/oval/shared.xml
@@ -10,22 +10,18 @@
- nobody
+ .*
state_accounts_users_home_files_permissions_interactive_uids
-{{%- if product == 'rhel7' %}}
- state_accounts_users_home_files_permissions_nfsnobody
-{{%- endif %}}
+ state_accounts_users_home_files_permissions_user_list
{{{ uid_min }}}
-{{%- if product == 'rhel7' %}}
-
- nfsnobody
+
+ ^{{{ user_list }}}$
-{{%- endif %}}
- nobody
+ .*
state_file_groupownership_home_directories_interactive_gids
+ state_file_permissions_groupownership_user_list
{{{ gid_min }}}
+
+ ^{{{ user_list }}}$
+
+
diff --git a/linux_os/guide/system/accounts/accounts-session/file_ownership_home_directories/oval/shared.xml b/linux_os/guide/system/accounts/accounts-session/file_ownership_home_directories/oval/shared.xml
index 3d0b9aecbae3..d6f604f37b51 100644
--- a/linux_os/guide/system/accounts/accounts-session/file_ownership_home_directories/oval/shared.xml
+++ b/linux_os/guide/system/accounts/accounts-session/file_ownership_home_directories/oval/shared.xml
@@ -21,8 +21,9 @@
create local variables composed by UIDs e Home Dirs.
-->
- nobody
+ .*
state_file_ownership_home_directories_interactive_uids
+ state_file_ownership_home_directories_user_list
- nobody
+ .*
state_file_permissions_home_directories_interactive_uids
+ state_file_permissions_home_files_permissions_user_list
{{{ uid_min }}}
+
+ ^{{{ user_list }}}$
+
+
diff --git a/shared/macros-oval.jinja b/shared/macros-oval.jinja
index e9eac999a46d..01f39e005320 100644
--- a/shared/macros-oval.jinja
+++ b/shared/macros-oval.jinja
@@ -902,3 +902,12 @@
{{%- endif %}}
{{%- endmacro %}}
+
+{{#
+ User list in form of regex that are excluded when checking user home directory permissions and ownerships.
+#}}
+{{%- if product in ["rhel7", "ol7"] %}}
+ {{%- set user_list="(nobody|nfsnobody)" %}}
+{{%- else %}}
+ {{%- set user_list="nobody" %}}
+{{%- endif %}}