diff --git a/defaults/main.yml b/defaults/main.yml
index 9f7c65e3..a476fe3f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -401,6 +401,8 @@ neutron_keepalived_no_track: "{{ _neutron_keepalived_no_track | default(True) }}
 neutron_ha_vrrp_auth_type: PASS
 neutron_l3_ha_net_cidr: 169.254.192.0/18
 
+neutron_l3_cleanup_on_shutdown: False
+
 ###
 ### DHCP Agent Plugin Configuration
 ###
diff --git a/handlers/main.yml b/handlers/main.yml
index f840faa4..0551003d 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -59,7 +59,7 @@
   shell: |
     for ns_pid in $(cat /sys/fs/cgroup/pids/neutron.slice/neutron-l3-agent.service/cgroup.procs); do
       echo $(readlink -f "/proc/$ns_pid/exe") | grep -qv "keepalived"
-      if [ $? -eq 0 ]; then
+      if [ $? -eq 0 ] || [ "{{ neutron_l3_cleanup_on_shutdown | bool }}" = "True" ]; then
         if kill -9 "$ns_pid"; then
           logger -s "old neutron-l3-agent pid found and has been cleaned up on: \"$ns_pid\""
         fi
diff --git a/templates/l3_agent.ini.j2 b/templates/l3_agent.ini.j2
index d5700f71..9a5e5193 100644
--- a/templates/l3_agent.ini.j2
+++ b/templates/l3_agent.ini.j2
@@ -18,6 +18,8 @@ ha_vrrp_advert_int = 2
 ha_vrrp_auth_password = {{ neutron_ha_vrrp_auth_password }}
 ha_vrrp_auth_type = {{ neutron_ha_vrrp_auth_type }}
 
+cleanup_on_shutdown = {{ neutron_l3_cleanup_on_shutdown }}
+
 # Metadata
 enable_metadata_proxy = True