diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index 7cac74be67..427c6db69c 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -21,10 +21,7 @@ api_workers = {{ neutron_api_workers }}
 rpc_workers = {{ openstack_service_rpc_workers }}
 rpc_state_report_workers = {{ openstack_service_rpc_workers }}
 
-# NOTE(SamYaple): We must specify this value here rather than the metadata conf
-# because it is used by the l3 and dhcp agents. The reason the path has 'kolla'
-# in it is because we are sharing this socket in a volume which is it's own dir
-metadata_proxy_socket = /var/lib/neutron/kolla/metadata_proxy
+state_path = /var/lib/neutron/kolla
 
 {% if neutron_plugin_agent == "openvswitch" or (neutron_plugin_agent == "ovn" and neutron_ovn_dhcp_agent | bool) %}
 interface_driver = openvswitch
diff --git a/releasenotes/notes/bug-2009884-a13cd185a29faf9a.yaml b/releasenotes/notes/bug-2009884-a13cd185a29faf9a.yaml
new file mode 100644
index 0000000000..944f58849a
--- /dev/null
+++ b/releasenotes/notes/bug-2009884-a13cd185a29faf9a.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes non-persistent Neutron agent state data.
+    `LP2009884 <https://launchpad.net/bugs/2009884>`__