diff --git a/neutron/templates/daemonset-bagpipe-bgp.yaml b/neutron/templates/daemonset-bagpipe-bgp.yaml
index 458c40f0db..ebd02738e4 100644
--- a/neutron/templates/daemonset-bagpipe-bgp.yaml
+++ b/neutron/templates/daemonset-bagpipe-bgp.yaml
@@ -94,7 +94,7 @@ spec:
             - name: pod-tmp
               mountPath: /tmp
             - name: pod-var-neutron
-              mountPath: /var/lib/neutron
+              mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
               mountPath: /tmp/neutron-bagpipe-bgp.sh
               subPath: neutron-bagpipe-bgp.sh
diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml
index 2b88a928ea..5757ef6bad 100644
--- a/neutron/templates/daemonset-dhcp-agent.yaml
+++ b/neutron/templates/daemonset-dhcp-agent.yaml
@@ -98,7 +98,7 @@ spec:
             - name: pod-tmp
               mountPath: /tmp
             - name: pod-var-neutron
-              mountPath: /var/lib/neutron
+              mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
               mountPath: /tmp/neutron-dhcp-agent.sh
               subPath: neutron-dhcp-agent.sh
diff --git a/neutron/templates/daemonset-l2gw-agent.yaml b/neutron/templates/daemonset-l2gw-agent.yaml
index d41e41137c..a44384e857 100644
--- a/neutron/templates/daemonset-l2gw-agent.yaml
+++ b/neutron/templates/daemonset-l2gw-agent.yaml
@@ -100,6 +100,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: pod-var-neutron
+              mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
               mountPath: /tmp/neutron-l2gw-agent.sh
               subPath: neutron-l2gw-agent.sh
@@ -126,6 +128,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: pod-var-neutron
+          emptyDir: {}
         - name: neutron-bin
           configMap:
             name: neutron-bin
diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml
index f2658374b4..ac16aec633 100644
--- a/neutron/templates/daemonset-l3-agent.yaml
+++ b/neutron/templates/daemonset-l3-agent.yaml
@@ -99,7 +99,7 @@ spec:
             - name: pod-tmp
               mountPath: /tmp
             - name: pod-var-neutron
-              mountPath: /var/lib/neutron
+              mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
               mountPath: /tmp/neutron-l3-agent.sh
               subPath: neutron-l3-agent.sh
diff --git a/neutron/templates/daemonset-lb-agent.yaml b/neutron/templates/daemonset-lb-agent.yaml
index 07788b43b5..1d9420241c 100644
--- a/neutron/templates/daemonset-lb-agent.yaml
+++ b/neutron/templates/daemonset-lb-agent.yaml
@@ -147,6 +147,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: pod-var-neutron
+              mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
               mountPath: /tmp/neutron-linuxbridge-agent.sh
               subPath: neutron-linuxbridge-agent.sh
@@ -198,6 +200,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: pod-var-neutron
+          emptyDir: {}
         - name: pod-shared
           emptyDir: {}
         - name: neutron-bin
diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml
index e1468cfd0a..67ee487fa7 100644
--- a/neutron/templates/daemonset-metadata-agent.yaml
+++ b/neutron/templates/daemonset-metadata-agent.yaml
@@ -118,6 +118,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: pod-var-neutron
+              mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
               mountPath: /tmp/neutron-metadata-agent.sh
               subPath: neutron-metadata-agent.sh
@@ -182,6 +184,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: pod-var-neutron
+          emptyDir: {}
         - name: neutron-bin
           configMap:
             name: neutron-bin
diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml
index 4a3e71de56..549fcf09cb 100644
--- a/neutron/templates/daemonset-ovs-agent.yaml
+++ b/neutron/templates/daemonset-ovs-agent.yaml
@@ -188,6 +188,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: pod-var-neutron
+              mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
               mountPath: /tmp/neutron-openvswitch-agent.sh
               subPath: neutron-openvswitch-agent.sh
@@ -253,6 +255,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: pod-var-neutron
+          emptyDir: {}
         - name: varlibopenvswitch
           emptyDir: {}
         - name: pod-shared
diff --git a/neutron/templates/daemonset-sriov-agent.yaml b/neutron/templates/daemonset-sriov-agent.yaml
index 73f760910e..5b2095046d 100644
--- a/neutron/templates/daemonset-sriov-agent.yaml
+++ b/neutron/templates/daemonset-sriov-agent.yaml
@@ -143,6 +143,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: pod-var-neutron
+              mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
               mountPath: /tmp/neutron-sriov-agent.sh
               subPath: neutron-sriov-agent.sh
@@ -208,6 +210,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: pod-var-neutron
+          emptyDir: {}
         - name: pod-shared
           emptyDir: {}
         - name: neutron-bin
diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml
index f12a65b8a9..b8ab79b336 100644
--- a/neutron/templates/deployment-server.yaml
+++ b/neutron/templates/deployment-server.yaml
@@ -89,6 +89,8 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
+            - name: pod-var-neutron
+              mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
             - name: neutron-bin
               mountPath: /tmp/neutron-server.sh
               subPath: neutron-server.sh
@@ -141,6 +143,8 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
+        - name: pod-var-neutron
+          emptyDir: {}
         - name: neutron-bin
           configMap:
             name: neutron-bin
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 6c04b9fcb1..580a70d0eb 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -1731,6 +1731,7 @@ conf:
       api_workers: 1
       rpc_workers: 4
       allow_overlapping_ips: True
+      state_path: /var/lib/neutron
       # core_plugin can be: ml2, calico
       core_plugin: ml2
       # service_plugin can be: router, odl-router, empty for calico,