diff --git a/defaults/main.yml b/defaults/main.yml
index 15c55f22..58b2ddb6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -336,7 +336,6 @@ neutron_agent_mode: legacy
 neutron_agent_down_time: 120
 neutron_agent_polling_interval: 5
 neutron_report_interval: "{{ neutron_agent_down_time | int / 2 | int }}"
-neutron_network_device_mtu: 1450
 
 # L3HA configuration options.
 neutron_ha_vrrp_auth_type: PASS
diff --git a/releasenotes/notes/neutron-mtu-cleanup-ce73693b4f7aef0d.yaml b/releasenotes/notes/neutron-mtu-cleanup-ce73693b4f7aef0d.yaml
new file mode 100644
index 00000000..25cf8b13
--- /dev/null
+++ b/releasenotes/notes/neutron-mtu-cleanup-ce73693b4f7aef0d.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - As described in the `Mitaka release notes
+    <http://docs.openstack.org/releasenotes/neutron/mitaka.html>`_
+    Neutron now correctly calculates for and advertises the MTU to
+    instances. As such the ``neutron_network_device_mtu`` variable
+    has been removed and the hard-coded values in the templates for
+    ``advertise_mtu``, ``path_mtu``, and ``segment_mtu`` have been
+    removed to allow upstream defaults to operate as intended.
diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2
index b4a421ae..ae42a308 100644
--- a/templates/neutron.conf.j2
+++ b/templates/neutron.conf.j2
@@ -13,7 +13,6 @@ log_file = /var/log/neutron/neutron.log
 {% if inventory_hostname in groups[neutron_services['neutron-server']['group']] %}
 
 # General, only applies to neutron server host group
-network_device_mtu = {{ neutron_network_device_mtu }}
 allow_overlapping_ips = True
 vlan_transparent = False
 
@@ -79,7 +78,6 @@ rpc_workers = {{ neutron_rpc_workers }}
 dhcp_agent_notification = True
 dhcp_agents_per_network = {{ dhcp_agents_max }}
 dhcp_lease_duration = 86400
-advertise_mtu = False
 
 # Nova notifications
 notify_nova_on_port_status_changes = True
diff --git a/templates/plugins/ml2/ml2_conf.ini.j2 b/templates/plugins/ml2/ml2_conf.ini.j2
index 56f6bb8a..ecf8ba31 100644
--- a/templates/plugins/ml2/ml2_conf.ini.j2
+++ b/templates/plugins/ml2/ml2_conf.ini.j2
@@ -7,9 +7,6 @@ tenant_network_types = {{ neutron_provider_networks.network_types }}
 mechanism_drivers = {{ neutron_plugins[neutron_plugin_type].mechanisms }}
 extension_drivers = port_security{% if 'qos' in neutron_plugin_base %},qos{% endif %}
 
-path_mtu = 0
-segment_mtu = 0
-
 {% if neutron_provider_networks.network_flat_networks is defined %}
 
 # ML2 flat networks