diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 466018e9d1..22705de7af 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -46,9 +46,9 @@ RUN git clone https://github.com/ansible/ansible.git \
     && git submodule update --init --recursive \
     && pip --no-cache-dir install .
 
-RUN mkdir -p /etc/ansible /usr/share/ansible /home/ansible \
+RUN useradd --user-group ansible --groups kolla \
+    && mkdir -p /etc/ansible /usr/share/ansible \
     && echo 'localhost ansible_connection=local' > /etc/ansible/hosts \
-    && useradd --user-group ansible --groups kolla \
     && sed -i 's|  "identity_api_version": "2.0",|  "identity_api_version": "3",|' /usr/lib/python2.7/site-packages/os_client_config/defaults.json
 
 COPY find_disks.py kolla_keystone_service.py kolla_keystone_user.py kolla_sanity.py kolla_zookeeper.py /usr/share/ansible/