diff --git a/charts/neutron/templates/bin/_neutron-ovn-metadata-agent.sh.tpl b/charts/neutron/templates/bin/_neutron-ovn-metadata-agent.sh.tpl
index d9695ab..b35ae1f 100644
--- a/charts/neutron/templates/bin/_neutron-ovn-metadata-agent.sh.tpl
+++ b/charts/neutron/templates/bin/_neutron-ovn-metadata-agent.sh.tpl
@@ -23,5 +23,4 @@
   --config-file /tmp/pod-shared/neutron-agent.ini \
 {{- end }}
       --config-file /tmp/pod-shared/ovn.ini
-      --config-file /tmp/ovn_metadata_agent.ini
 
diff --git a/charts/neutron/templates/bin/_neutron-server.sh.tpl b/charts/neutron/templates/bin/_neutron-server.sh.tpl
index 93f21ec..0954ea4 100644
--- a/charts/neutron/templates/bin/_neutron-server.sh.tpl
+++ b/charts/neutron/templates/bin/_neutron-server.sh.tpl
@@ -20,23 +20,23 @@
 function start () {
   exec neutron-server \
         --config-file /etc/neutron/neutron.conf \
+{{- if ( has "ovn" .Values.network.backend ) }}
+        --config-file /tmp/pod-shared/ovn.ini \
+{{- end }}
+{{- if .Values.conf.plugins.taas.taas.enabled }} \
+        --config-file /etc/neutron/taas_plugin.ini \
+{{- end }}
+{{- if ( has "sriov" .Values.network.backend ) }} \
+        --config-file /etc/neutron/plugins/ml2/sriov_agent.ini \
+{{- end }}
+{{- if .Values.conf.plugins.l2gateway }} \
+        --config-file /etc/neutron/l2gw_plugin.ini \
+{{- end }}
 {{- if ( has "tungstenfabric" .Values.network.backend ) }}
         --config-file /etc/neutron/plugins/tungstenfabric/tf_plugin.ini
 {{- else }}
         --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
 {{- end }}
-{{- if ( has "ovn" .Values.network.backend ) }}
-        --config-file /tmp/pod-shared/ovn.ini
-{{- end }}
-{{- if .Values.conf.plugins.taas.taas.enabled }} \
-        --config-file /etc/neutron/taas_plugin.ini
-{{- end }}
-{{- if ( has "sriov" .Values.network.backend ) }} \
-        --config-file /etc/neutron/plugins/ml2/sriov_agent.ini
-{{- end }}
-{{- if .Values.conf.plugins.l2gateway }} \
-        --config-file /etc/neutron/l2gw_plugin.ini
-{{- end }}
 }
 
 function stop () {
diff --git a/hack/sync-charts.sh b/hack/sync-charts.sh
index 0b75cbc..e7eef5c 100755
--- a/hack/sync-charts.sh
+++ b/hack/sync-charts.sh
@@ -151,7 +151,7 @@
   | filterdiff -p2 -x 'Chart.yaml' \
   | filterdiff -p1 -i 'neutron/*' \
   | patch -p2 -d ${ATMOSPHERE}/charts/neutron
-curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~889258/revisions/3/patch?download' \
+curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~889258/revisions/5/patch?download' \
   | base64 --decode \
   | filterdiff -p1 -x 'releasenotes/*' \
   | filterdiff -p2 -x 'Chart.yaml' \