diff --git a/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh b/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
index f9f0d3bceb..98c9404726 100755
--- a/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
+++ b/docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
@@ -83,4 +83,4 @@ ip netns list | grep qdhcp | while read -r line ; do
 done
 
 # Start DHCP Agent
-exec /usr/bin/neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini
+exec /usr/bin/neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron
diff --git a/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh b/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh
index bc9692c04f..9bb7168cd3 100755
--- a/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh
+++ b/docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh
@@ -82,4 +82,4 @@ ip netns list | grep qrouter | while read -r line ; do
 done
 
 # Start L3 Agent
-exec /usr/bin/neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini
+exec /usr/bin/neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini --config-dir /etc/neutron
diff --git a/docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh b/docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh
index 568888d2c8..fbf540f6ef 100755
--- a/docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh
+++ b/docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh
@@ -26,4 +26,4 @@ crudini --set $cfg \
         physical_interface_mappings \
         "${NEUTRON_FLAT_NETWORK_NAME}:${NEUTRON_FLAT_NETWORK_INTERFACE}"
 
-exec /usr/bin/neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
+exec /usr/bin/neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neutron
diff --git a/docker/neutron/neutron-agents/config-scripts/config-metadata-agent.sh b/docker/neutron/neutron-agents/config-scripts/config-metadata-agent.sh
index e32258f95d..d1eef341c1 100755
--- a/docker/neutron/neutron-agents/config-scripts/config-metadata-agent.sh
+++ b/docker/neutron/neutron-agents/config-scripts/config-metadata-agent.sh
@@ -71,4 +71,4 @@ crudini --set $cfg \
         "${NEUTRON_SHARED_SECRET}"
 
 # Start Metadata Agent
-exec /usr/bin/neutron-metadata-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini
+exec /usr/bin/neutron-metadata-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron