diff --git a/docker/common/neutron/neutron-base/config-sudoers.sh b/docker/common/neutron/neutron-base/config-sudoers.sh
index 0e02226db80b73838863bb80119b59a4d5c11d27..82cf0d62460cbb38284d911daa10c98a315f464d 100644
--- a/docker/common/neutron/neutron-base/config-sudoers.sh
+++ b/docker/common/neutron/neutron-base/config-sudoers.sh
@@ -3,10 +3,10 @@
 # Neutron uses rootwrap which requires a tty for sudo.
 # Since the container is running in daemon mode, a tty
 # is not present and requiretty must be commented out.
-if [ ! -f /var/run/sudo-modified ]; then
+if [ ! -f /sudo-modified ]; then
     chmod 0640 /etc/sudoers
     sed -i '/Defaults    requiretty/s/^/#/' /etc/sudoers
     chmod 0440 /etc/sudoers
 fi
 
-touch /var/run/sudo-modified
+touch /sudo-modified
diff --git a/docker/common/neutron/neutron-dhcp-agent/config-internal.sh b/docker/common/neutron/neutron-dhcp-agent/config-internal.sh
index 37182ebcacc8898ff707b49cd6ab507403bc7596..aa7a470858a16fd91b69edb25fe086fdd2389741 100755
--- a/docker/common/neutron/neutron-dhcp-agent/config-internal.sh
+++ b/docker/common/neutron/neutron-dhcp-agent/config-internal.sh
@@ -3,7 +3,6 @@
 set -e
 
 . /opt/kolla/config-neutron.sh
-. /opt/kolla/config-sudoers.sh
 
 : ${DHCP_DRIVER:=neutron.agent.linux.dhcp.Dnsmasq}
 : ${USE_NAMESPACES:=true}
diff --git a/docker/common/neutron/neutron-dhcp-agent/start.sh b/docker/common/neutron/neutron-dhcp-agent/start.sh
index 71ec4678a43ad0455d5dfb60b49f33afc0be59cb..725b523520968d8b2f4d9704cbf5d7e4eac823c5 100755
--- a/docker/common/neutron/neutron-dhcp-agent/start.sh
+++ b/docker/common/neutron/neutron-dhcp-agent/start.sh
@@ -6,6 +6,7 @@ ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_ag
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
+source /opt/kolla/config-sudoers.sh
 
 # Override set_configs() here because it doesn't work for fat containers like
 # this one.
diff --git a/docker/common/neutron/neutron-l3-agent/config-internal.sh b/docker/common/neutron/neutron-l3-agent/config-internal.sh
index c4fb8520505b966c35c5a234ab95fcab5ecb6a06..94d7af0a60e22de823dbda2311c0c487b58c4267 100755
--- a/docker/common/neutron/neutron-l3-agent/config-internal.sh
+++ b/docker/common/neutron/neutron-l3-agent/config-internal.sh
@@ -3,7 +3,6 @@
 set -e
 
 . /opt/kolla/config-neutron.sh
-. /opt/kolla/config-sudoers.sh
 
 : ${USE_NAMESPACES:=true}
 
diff --git a/docker/common/neutron/neutron-l3-agent/start.sh b/docker/common/neutron/neutron-l3-agent/start.sh
index fd85c22b1371630736b0465ad0cbafbc6baae6c1..f18116107232b3ec8f6768f19a72206c09ca65e3 100755
--- a/docker/common/neutron/neutron-l3-agent/start.sh
+++ b/docker/common/neutron/neutron-l3-agent/start.sh
@@ -6,6 +6,7 @@ ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agen
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
+source /opt/kolla/config-sudoers.sh
 
 # Override set_configs() here because it doesn't work for fat containers like
 # this one.
diff --git a/docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh b/docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh
index bd8f90194be4f04ef98c81ae1974adf10c94e877..343caf2982141ac1d74ec5c4a16da772e3e28953 100755
--- a/docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh
+++ b/docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh
@@ -3,7 +3,6 @@
 set -e
 
 . /opt/kolla/config-neutron.sh
-. /opt/kolla/config-sudoers.sh
 
 : ${NEUTRON_FLAT_NETWORK_NAME:=physnet1}
 : ${NEUTRON_FLAT_NETWORK_INTERFACE:=eth1}
diff --git a/docker/common/neutron/neutron-linuxbridge-agent/start.sh b/docker/common/neutron/neutron-linuxbridge-agent/start.sh
index a8b4879f03d3211ced347e8636e6461919f77b0a..c16b979741006964681d0f647bebab67861728a8 100755
--- a/docker/common/neutron/neutron-linuxbridge-agent/start.sh
+++ b/docker/common/neutron/neutron-linuxbridge-agent/start.sh
@@ -6,6 +6,7 @@ ARGS="--config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neut
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
+source /opt/kolla/config-sudoers.sh
 
 # Config-internal script exec out of this function, it does not return here.
 set_configs
diff --git a/docker/common/neutron/neutron-metadata-agent/config-internal.sh b/docker/common/neutron/neutron-metadata-agent/config-internal.sh
index d1eef341c11141cb4cd4cbc5831004451e740b07..0c2aecd02aa2f5e272d7d7695d7c20ad189c3c0c 100755
--- a/docker/common/neutron/neutron-metadata-agent/config-internal.sh
+++ b/docker/common/neutron/neutron-metadata-agent/config-internal.sh
@@ -3,7 +3,6 @@
 set -e
 
 . /opt/kolla/config-neutron.sh
-. /opt/kolla/config-sudoers.sh
 
 : ${KEYSTONE_REGION:=RegionOne}
 : ${ENDPOINT_TYPE:=adminURL}
diff --git a/docker/common/neutron/neutron-metadata-agent/start.sh b/docker/common/neutron/neutron-metadata-agent/start.sh
index e67946117b1a29e8410f98405c248d90a2d2697e..ab4f4a590ca69f0e4a604044bacd0e6abbb31701 100755
--- a/docker/common/neutron/neutron-metadata-agent/start.sh
+++ b/docker/common/neutron/neutron-metadata-agent/start.sh
@@ -6,6 +6,7 @@ ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadat
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
+source /opt/kolla/config-sudoers.sh
 
 # Override set_configs() here because it doesn't work for fat containers like
 # this one.
diff --git a/docker/common/neutron/neutron-openvswitch-agent/config-internal.sh b/docker/common/neutron/neutron-openvswitch-agent/config-internal.sh
index 8c4d1a0371be3d116a4e4f7cef2b3934ec73630b..de22c4adb5bed0365428e50a98247cf87903fbe2 100755
--- a/docker/common/neutron/neutron-openvswitch-agent/config-internal.sh
+++ b/docker/common/neutron/neutron-openvswitch-agent/config-internal.sh
@@ -3,7 +3,6 @@
 set -e
 
 . /opt/kolla/config-neutron.sh
-. /opt/kolla/config-sudoers.sh
 
 : ${NEUTRON_FLAT_NETWORK_NAME:=physnet1}
 : ${NEUTRON_FLAT_NETWORK_INTERFACE:=eth1}
diff --git a/docker/common/neutron/neutron-openvswitch-agent/start.sh b/docker/common/neutron/neutron-openvswitch-agent/start.sh
index 4c05db9c50c1878d325930fd2c9fe3d3bfbc87df..0c404eafc44c6eb7922ea78a786d2a5c312319d3 100755
--- a/docker/common/neutron/neutron-openvswitch-agent/start.sh
+++ b/docker/common/neutron/neutron-openvswitch-agent/start.sh
@@ -6,6 +6,7 @@ ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
+source /opt/kolla/config-sudoers.sh
 
 # Config-internal script exec out of this function, it does not return here.
 set_configs