diff --git a/devstack/lib/docker b/devstack/lib/docker
index 99c2048..c1602ba 100644
--- a/devstack/lib/docker
+++ b/devstack/lib/docker
@@ -24,7 +24,8 @@ set +o xtrace
 DOCKER_ENGINE_SOCKET_FILE=${DOCKER_ENGINE_SOCKET_FILE:-/var/run/docker.sock}
 DOCKER_ENGINE_PORT=${DOCKER_ENGINE_PORT:-2375}
 DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-}
-DOCKER_GROUP=${DOCKER_GROUP:-$STACK_USER}
+STACK_GROUP="$( id --group --name "$STACK_USER" )"
+DOCKER_GROUP=${DOCKER_GROUP:-$STACK_GROUP}
 DOCKER_CGROUP_DRIVER=${DOCKER_CGROUP_DRIVER:-}
 # TODO(hongbin): deprecate and remove clear container
 ENABLE_CLEAR_CONTAINER=$(trueorfalse False ENABLE_CLEAR_CONTAINER)