diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index f6092aa9f0fff5d912e4f03f12142f59655c66b8..e0769302c0746d295ea14d9477be576a1a4f7477 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -14,3 +14,5 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {{ include_footer }}
+
+USER cinder
diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh
index e9a38ac0f5e61f03db53ad75a636155beaec3644..176515189d4370293c8989f1e71b890d7bbe843a 100644
--- a/docker/cinder/cinder-api/extend_start.sh
+++ b/docker/cinder/cinder-api/extend_start.sh
@@ -4,6 +4,6 @@ set -o errexit
 # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
 # of the KOLLA_BOOTSTRAP variable being set, including empty.
 if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    sudo -H -u cinder cinder-manage db sync
+    cinder-manage db sync
     exit 0
 fi
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2
index f0541f59b3e171a681647978716c0884092fdd3a..0549823593d9b4afcc3dadf9480f5a37a88fc03d 100644
--- a/docker/cinder/cinder-backup/Dockerfile.j2
+++ b/docker/cinder/cinder-backup/Dockerfile.j2
@@ -2,3 +2,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
 {{ include_footer }}
+
+USER cinder
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 9adae372a0f4eba8b685a353b4799e5297096cf2..fce75009a1e3e7e75031a038ac553e9e1781b93c 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -37,3 +37,5 @@ RUN ln -s cinder-base-source/* cinder \
     && chown -R cinder: /etc/cinder /var/log/cinder /home/cinder
 
 {% endif %}
+
+RUN usermod -a -G kolla cinder
diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2
index f0541f59b3e171a681647978716c0884092fdd3a..0549823593d9b4afcc3dadf9480f5a37a88fc03d 100644
--- a/docker/cinder/cinder-scheduler/Dockerfile.j2
+++ b/docker/cinder/cinder-scheduler/Dockerfile.j2
@@ -2,3 +2,5 @@ FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
 {{ include_footer }}
+
+USER cinder
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index c922e73f20b7787ceb0681ccb21727948737b105..e3aef3fc278a27eddbcb4607e861eaf3b2a6b599 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -13,3 +13,5 @@ RUN yum install -y \
 {% endif %}
 
 {{ include_footer }}
+
+USER cinder