diff --git a/odoo/odoo/Dockerfile b/odoo/odoo/Dockerfile
index c108e47..03fd9b3 100644
--- a/odoo/odoo/Dockerfile
+++ b/odoo/odoo/Dockerfile
@@ -34,15 +34,17 @@ RUN apt-get purge -y --auto-remove \
       && rm ${WKNAME}
 
 # Create odoo user
-RUN useradd odoo -d /opt/odoo
+RUN useradd odoo -md /opt/odoo
 
 # Install OCB 8.0 latest
 ENV ODOO_BRANCH 8.0
 WORKDIR /opt/odoo
+# Default user : odoo
+USER odoo
 RUN mkdir pipcache data backups extra-addons custom-addons
 RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git
-RUN pip install -U pip
-RUN pip install -r OCB/requirements.txt --cache-dir pipcache
+RUN pip install --user -U pip
+RUN pip install --user -r OCB/requirements.txt
 
 # Launch scripts
 COPY ./launch.sh ./
@@ -50,14 +52,10 @@ COPY ./genconf.sh ./
 
 # Post-install tasks
 RUN touch odoo.conf
-RUN chown -R odoo .
 
 # Odoo default ports
 EXPOSE 8069 8072
 
-# Default user : odoo
-USER odoo
-
 # Volumes : data dir for filestore and addons
 VOLUME /opt/odoo/data
 
diff --git a/odoo/odoo/Dockerfile.10 b/odoo/odoo/Dockerfile.10
index 3087314..e8dfcc7 100644
--- a/odoo/odoo/Dockerfile.10
+++ b/odoo/odoo/Dockerfile.10
@@ -36,15 +36,17 @@ RUN apt-get purge -y --auto-remove \
       && rm ${WKNAME}
 
 # Create odoo user
-RUN useradd odoo -d /opt/odoo
+RUN useradd odoo -md /opt/odoo
 
 # Install OCB 8.0 latest
 ENV ODOO_BRANCH 10.0
 WORKDIR /opt/odoo
+# Default user : odoo
+USER odoo
 RUN mkdir pipcache data backups extra-addons custom-addons
 RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git
-RUN pip install -U pip
-RUN pip install -r OCB/requirements.txt --cache-dir pipcache
+RUN pip install --user -U pip
+RUN pip install --user -r OCB/requirements.txt
 
 # Launch scripts
 COPY ./launch10.sh ./
@@ -52,14 +54,10 @@ COPY ./genconf.sh ./
 
 # Post-install tasks
 RUN touch odoo.conf
-RUN chown -R odoo .
 
 # Odoo default ports
 EXPOSE 8069 8072
 
-# Default user : odoo
-USER odoo
-
 # Volumes : data dir for filestore and addons
 VOLUME /opt/odoo/data
 
diff --git a/odoo/odoo/Dockerfile.9 b/odoo/odoo/Dockerfile.9
index 5831eeb..004c7a2 100644
--- a/odoo/odoo/Dockerfile.9
+++ b/odoo/odoo/Dockerfile.9
@@ -36,15 +36,17 @@ RUN apt-get purge -y --auto-remove \
       && rm ${WKNAME}
 
 # Create odoo user
-RUN useradd odoo -d /opt/odoo
+RUN useradd odoo -md /opt/odoo
 
 # Install OCB 8.0 latest
 ENV ODOO_BRANCH 9.0
 WORKDIR /opt/odoo
+# Default user : odoo
+USER odoo
 RUN mkdir pipcache data backups extra-addons custom-addons
 RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git
-RUN pip install -U pip
-RUN pip install -r OCB/requirements.txt --cache-dir pipcache
+RUN pip install --user -U pip
+RUN pip install --user -r OCB/requirements.txt
 
 # Launch scripts
 COPY ./launch.sh ./
@@ -52,14 +54,10 @@ COPY ./genconf.sh ./
 
 # Post-install tasks
 RUN touch odoo.conf
-RUN chown -R odoo .
 
 # Odoo default ports
 EXPOSE 8069 8072
 
-# Default user : odoo
-USER odoo
-
 # Volumes : data dir for filestore and addons
 VOLUME /opt/odoo/data