diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2
index 7d03bcd49f..ba54e144c8 100644
--- a/docker/grafana/Dockerfile.j2
+++ b/docker/grafana/Dockerfile.j2
@@ -8,14 +8,16 @@ MAINTAINER {{ maintainer }}
 {% set grafana_packages = ['grafana'] %}
 {{ macros.install_packages(grafana_packages | customizable("packages")) }}
 
-RUN usermod -a -G kolla grafana \
-    && grafana-cli plugins install sileht-gnocchi-datasource
-
 WORKDIR /usr/share/grafana
 
 COPY grafana_sudoers /etc/sudoers.d/kolla_grafana_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
+RUN grafana-cli plugins install sileht-gnocchi-datasource \
+    && chmod 750 /etc/sudoers.d \
+    && chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \
+    && usermod -a -G kolla grafana
+
 {% block grafana_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 {{ include_footer }}
diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2
index 3bc1cc53e5..b750791316 100644
--- a/docker/vmtp/Dockerfile.j2
+++ b/docker/vmtp/Dockerfile.j2
@@ -17,7 +17,7 @@ RUN pip install vmtp \
 
 COPY vmtp_sudoers /etc/sudoers.d/kolla_vmtp_sudoers
 RUN chmod 750 /etc/sudoers.d \
-    && chmod 440 /etc/sudoers.d \
+    && chmod 440 /etc/sudoers.d/kolla_vmtp_sudoers \
     && usermod -a -G kolla vmtp
 
 {% block vmtp_footer %}{% endblock %}