diff --git a/playbooks/roles/os_neutron/defaults/main.yml b/playbooks/roles/os_neutron/defaults/main.yml
index 570e5c615c..182e38f070 100644
--- a/playbooks/roles/os_neutron/defaults/main.yml
+++ b/playbooks/roles/os_neutron/defaults/main.yml
@@ -120,6 +120,9 @@ neutron_agent_polling_interval: 5
 neutron_report_interval: "{{ neutron_agent_down_time | int / 2 | int }}"
 neutron_network_device_mtu: 1450
 
+# L3 configuration options
+neutron_l3_router_delete_namespaces: True
+
 # L3HA configuration options.
 neutron_ha_vrrp_advert_int: 2
 neutron_ha_vrrp_auth_password: None
diff --git a/playbooks/roles/os_neutron/templates/l3_agent.ini.j2 b/playbooks/roles/os_neutron/templates/l3_agent.ini.j2
index a6d37f9240..766152c104 100644
--- a/playbooks/roles/os_neutron/templates/l3_agent.ini.j2
+++ b/playbooks/roles/os_neutron/templates/l3_agent.ini.j2
@@ -25,6 +25,9 @@ max_l3_agents_per_router = {{ neutron_max_l3_agents_per_router | default(groups[
 min_l3_agents_per_router = {{ neutron_min_l3_agents_per_router | default(min_l3_router) }}
 send_arp_for_ha = 3
 
+# L3 configuration options
+router_delete_namespaces = {{ neutron_l3_router_delete_namespaces }}
+
 # L3 Agent interfaces
 interface_driver = {{ neutron_driver_interface }}
 handle_internal_only_routers = True