diff --git a/neutron/templates/bin/_db-sync.sh.tpl b/neutron/templates/bin/_db-sync.sh.tpl
index e5f5931a0e..a98f63236a 100644
--- a/neutron/templates/bin/_db-sync.sh.tpl
+++ b/neutron/templates/bin/_db-sync.sh.tpl
@@ -18,5 +18,5 @@ set -ex
 
 neutron-db-manage \
   --config-file /etc/neutron/neutron.conf \
-  --config-file /etc/neutron/plugins/ml2/ml2-conf.ini \
+  --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
   upgrade head
diff --git a/neutron/templates/configmap-bin.yaml b/neutron/templates/configmap-bin.yaml
index 1d39df34cd..1794ba0aaa 100644
--- a/neutron/templates/configmap-bin.yaml
+++ b/neutron/templates/configmap-bin.yaml
@@ -17,9 +17,9 @@ kind: ConfigMap
 metadata:
   name: neutron-bin
 data:
-  db-init.py: |
+  db-init.py: |+
 {{- include "helm-toolkit.db_init" . | indent 4 }}
-  db-sync.sh: |
+  db-sync.sh: |+
 {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
   ks-service.sh: |+
 {{- include "helm-toolkit.keystone_service" . | indent 4 }}
@@ -27,11 +27,11 @@ data:
 {{- include "helm-toolkit.keystone_endpoints" . | indent 4 }}
   ks-user.sh: |+
 {{- include "helm-toolkit.keystone_user" . | indent 4 }}
-  neutron-openvswitch-agent.sh: |
+  neutron-openvswitch-agent.sh: |+
 {{ tuple "bin/_neutron-openvswitch-agent.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
-  openvswitch-db-server.sh: |
+  openvswitch-db-server.sh: |+
 {{ tuple "bin/_openvswitch-db-server.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
-  openvswitch-ensure-configured.sh: |
+  openvswitch-ensure-configured.sh: |+
 {{ tuple "bin/_openvswitch-ensure-configured.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
-  openvswitch-vswitchd.sh: |
+  openvswitch-vswitchd.sh: |+
 {{ tuple "bin/_openvswitch-vswitchd.sh.tpl" . | include "helm-toolkit.template" | indent 4 }}
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 19c1bcbf19..02815369e9 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -89,6 +89,7 @@ network:
     port: 8775
 
 keystone:
+  
   admin_user: "admin"
   admin_user_domain: "default"
   admin_password: "password"
@@ -96,6 +97,14 @@ keystone:
   admin_project_domain: "default"
   admin_region_name: "RegionOne"
 
+  neutron_user: "neutron"
+  neutron_user_domain: "default"
+  neutron_user_role: "admin"
+  neutron_password: "password"
+  neutron_project_name: "service"
+  neutron_project_domain: "default"
+  neutron_region_name: "RegionOne"  
+
 metadata_agent:
   default:
     debug: 'True'