diff --git a/defaults/main.yml b/defaults/main.yml
index 3095b16c..b655af0e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -392,6 +392,11 @@ neutron_local_ip: 127.0.0.1
 ### L3 Agent Plugin Configuration
 ###
 
+# Enable/disable no_track for keepalived (available for keepalived >2.0)
+# NOTE(noonedeadpunk): Is is done until the merge and backport of the fix for
+# https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1896506
+neutron_keepalived_no_track: "{{ _neutron_keepalived_no_track | default(True) }}"
+
 # L3HA configuration options
 neutron_ha_vrrp_auth_type: PASS
 neutron_l3_ha_net_cidr: 169.254.192.0/18
diff --git a/templates/l3_agent.ini.j2 b/templates/l3_agent.ini.j2
index a9e9cf22..d5700f71 100644
--- a/templates/l3_agent.ini.j2
+++ b/templates/l3_agent.ini.j2
@@ -21,6 +21,8 @@ ha_vrrp_auth_type = {{ neutron_ha_vrrp_auth_type }}
 # Metadata
 enable_metadata_proxy = True
 
+keepalived_use_no_track = {{ neutron_keepalived_no_track }}
+
 # L3 plugins
 {% set l3_agent_plugins = [] %}
 
diff --git a/vars/debian.yml b/vars/debian.yml
index 8e86f3e0..ba705f3b 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -104,3 +104,5 @@ neutron_remove_distro_packages:
 neutron_oslomsg_amqp1_distro_packages:
   - libsasl2-modules
   - sasl2-bin
+
+_neutron_keepalived_no_track: "{{ (ansible_distribution_major_version is version('20', '>=') or ansible_os_family | lower == 'debian') }}"
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 29a5dcaa..49546cf5 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -87,3 +87,5 @@ neutron_oslomsg_amqp1_distro_packages:
   - cyrus-sasl-lib
   - cyrus-sasl-plain
   - cyrus-sasl-md5
+
+_neutron_keepalived_no_track: "{{ (ansible_distribution_major_version is version('8', '>=')) }}"