diff --git a/roles/sap_hana_preconfigure/README.md b/roles/sap_hana_preconfigure/README.md
index 4459ca657..f65e91566 100644
--- a/roles/sap_hana_preconfigure/README.md
+++ b/roles/sap_hana_preconfigure/README.md
@@ -420,6 +420,7 @@ The saptune solution to apply (SLES for SAP Applications).
- _Default:_ `false`
On Azure, TCP timestamps, reuse and recycle should be disabled (SLES for SAP Applications).
+If the variable is set, an override file for saptune will be created (/etc/saptune/override/2382421) to set net.ipv4.tcp_timestamps and net.ipv4.tcp_tw_reuse to 0.
Set this parameter to `true` on Azure.
diff --git a/roles/sap_hana_preconfigure/tasks/SLES/assert-configuration.yml b/roles/sap_hana_preconfigure/tasks/SLES/assert-configuration.yml
index b2d29f5fa..b2e96401f 100644
--- a/roles/sap_hana_preconfigure/tasks/SLES/assert-configuration.yml
+++ b/roles/sap_hana_preconfigure/tasks/SLES/assert-configuration.yml
@@ -39,24 +39,3 @@
fail_msg: "FAIL: the configured saptune solution is '{{ __sap_hana_preconfigure_saptune_configured_solution
}}'' and does not match the expected solution '{{ sap_hana_preconfigure_saptune_solution }}'"
success_msg: "PASS: the configured saptune solution matches the expected solution '{{ sap_hana_preconfigure_saptune_solution }}'"
-
-# If this is a cluster node on Azure, we need to override to disable tcp timestamps, reuse and recycle.
-# This can be done by copying the sapnote file 2382421 from /usr/share/saptune/notes to /etc/saptune/override
-# The value can then override in the in the new file
-
-# - name: Disable TCP timestamps, recycle & reuse
-# ansible.builtin.blockinfile:
-# path: /etc/saptune/override/2382421
-# create: yes
-# backup: yes
-# owner: root
-# group: root
-# mode: '0640'
-# marker: ""
-# block: |
-# [sysctl]
-# net.ipv4.tcp_timestamps = 0
-# net.ipv4.tcp_tw_reuse = 0
-# net.ipv4.tcp_tw_recycle = 0
-# when:
-# - sap_hana_preconfigure_saptune_azure
diff --git a/roles/sap_hana_preconfigure/tasks/SLES/configuration.yml b/roles/sap_hana_preconfigure/tasks/SLES/configuration.yml
index 1cc024a22..61b9b0818 100644
--- a/roles/sap_hana_preconfigure/tasks/SLES/configuration.yml
+++ b/roles/sap_hana_preconfigure/tasks/SLES/configuration.yml
@@ -92,6 +92,7 @@
# If this is a cluster node on Azure, we need to override to disable tcp timestamps, reuse and recycle.
# This can be done by copying the sapnote file 2382421 from /usr/share/saptune/notes to /etc/saptune/override
# The value can then override in the in the new file
+# net.ipv4.tcp_tw_recycle = 0 was removed as it is not relevant for SLES 15+
- name: Disable TCP timestamps, recycle & reuse
ansible.builtin.blockinfile:
@@ -106,7 +107,6 @@
[sysctl]
net.ipv4.tcp_timestamps = 0
net.ipv4.tcp_tw_reuse = 0
- net.ipv4.tcp_tw_recycle = 0
when:
- sap_hana_preconfigure_saptune_azure