diff --git a/controls/anssi.yml b/controls/anssi.yml
index 3c0abf8011d..c7c7918d6da 100644
--- a/controls/anssi.yml
+++ b/controls/anssi.yml
@@ -776,30 +776,19 @@ controls:
     - accounts_password_pam_unix_remember
 
   - id: R32
-    title: User session timeout
+    title: Configuring a timeout on local user sessions
     levels:
     - intermediary
     description: >-
-      Remote user sessions (shell access, graphical clients) must be closed
-      after a certain period of inactivity.
+      Local user sessions (console TTY, graphical session) must be locked after a certain period of inactivity.
     notes: >-
-      There is no specific capability to check remote user inactivity, but some shells allow the
-      session inactivity time out to be configured via TMOUT variable.
-      In OpenSSH < 8.2 the inactivity of the user is implied from the network inactivity.
-      The server is configured to disconnect sessions if no data has been received within the idle timeout,
-      regardless of liveness status (ClientAliveCountMax is 0 and ClientAliveInterval is > 0).
-      In OpenSSH >= 8.2 there is no way to disconnect sessions based on client liveness.
-      The semantics of "ClientAliveCountMax 0" has changed from "disconnect on first timeout" to
-      "don't disconnect network inactive sessions". The server either probes for the client liveness
-      or keeps inactive sessions connected.
-    status: supported
+      ANSSI doesn't specify the length of the inactivity period, we are choosing 10 minutes as reasonable number.
+    status: automated
     rules:
+    - logind_session_timeout
+    - var_logind_session_timeout=10_minutes
     - accounts_tmout
     - var_accounts_tmout=10_min
-    - sshd_set_idle_timeout
-    - sshd_idle_timeout_value=10_minutes
-    - sshd_set_keepalive
-    - var_sshd_set_keepalive=0
 
   - id: R33
     title: Use of dedicated administration accounts
diff --git a/products/rhel7/profiles/anssi_nt28_enhanced.profile b/products/rhel7/profiles/anssi_nt28_enhanced.profile
index be64513dcb8..f80fca7df30 100644
--- a/products/rhel7/profiles/anssi_nt28_enhanced.profile
+++ b/products/rhel7/profiles/anssi_nt28_enhanced.profile
@@ -22,6 +22,7 @@ selections:
     - anssi:all:enhanced
     - '!selinux_state'
     - '!timer_logrotate_enabled'
+    - '!logind_session_timeout'
     # Following rules once had a prodtype incompatible with the rhel7 product
     - '!accounts_passwords_pam_tally2_deny_root'
     - '!sysctl_kernel_unprivileged_bpf_disabled'
diff --git a/products/rhel7/profiles/anssi_nt28_high.profile b/products/rhel7/profiles/anssi_nt28_high.profile
index 5d9cfa4b578..95973d8644f 100644
--- a/products/rhel7/profiles/anssi_nt28_high.profile
+++ b/products/rhel7/profiles/anssi_nt28_high.profile
@@ -21,6 +21,7 @@ description: |-
 selections:
     - anssi:all:high
     - '!timer_logrotate_enabled'
+    - '!logind_session_timeout'
     # Following rules once had a prodtype incompatible with the rhel7 product
     - '!kernel_config_gcc_plugin_structleak_byref_all'
     - '!accounts_passwords_pam_tally2_deny_root'
diff --git a/products/rhel7/profiles/anssi_nt28_intermediary.profile b/products/rhel7/profiles/anssi_nt28_intermediary.profile
index 2fadef81950..411a14ceaff 100644
--- a/products/rhel7/profiles/anssi_nt28_intermediary.profile
+++ b/products/rhel7/profiles/anssi_nt28_intermediary.profile
@@ -20,6 +20,7 @@ description: |-
 
 selections:
     - anssi:all:intermediary
+    - '!logind_session_timeout'
     # Following rules once had a prodtype incompatible with the rhel7 product
     - '!accounts_passwords_pam_tally2_deny_root'
     - '!sysctl_kernel_unprivileged_bpf_disabled'
diff --git a/products/rhel7/profiles/anssi_nt28_minimal.profile b/products/rhel7/profiles/anssi_nt28_minimal.profile
index b23c0bb85fa..5e7e2ea6e85 100644
--- a/products/rhel7/profiles/anssi_nt28_minimal.profile
+++ b/products/rhel7/profiles/anssi_nt28_minimal.profile
@@ -20,6 +20,7 @@ description: |-
 
 selections:
     - anssi:all:minimal
+    - '!logind_session_timeout'
     # Following rules once had a prodtype incompatible with the rhel7 product
     - '!cracklib_accounts_password_pam_minlen'
     - '!package_dnf-automatic_installed'