diff --git a/dockerfiles/tasks/composer/Dockerfile b/dockerfiles/tasks/composer/Dockerfile
index da1b431..8f1ecdd 100644
--- a/dockerfiles/tasks/composer/Dockerfile
+++ b/dockerfiles/tasks/composer/Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update && apt-get install -y \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
   && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
   && composer global require franzl/studio \
-  && mkdir /.composer && chmod -R 777 /.composer
+  && useradd -u 1000 -d /home/user user \
+  && mkdir -p /home/user/.composer && chmod -R 777 /home/user/.composer
 
 ENTRYPOINT /usr/local/bin/composer
-RUN useradd -u 1000 -d /home/user user
diff --git a/dockerfiles/tasks/composer/Dockerfile-71 b/dockerfiles/tasks/composer/Dockerfile-71
index 65c18ec..379c2f3 100644
--- a/dockerfiles/tasks/composer/Dockerfile-71
+++ b/dockerfiles/tasks/composer/Dockerfile-71
@@ -22,8 +22,7 @@ RUN apt-get update && apt-get install -y software-properties-common python-softw
   && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
   && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
-  && mkdir /.composer && chmod -R 777 /.composer
+  && useradd -u 1000 -d /home/user user \
+  && mkdir -p /home/user/.composer && chmod -R 777 /home/user/.composer
 
 ENTRYPOINT ["/usr/local/bin/composer"]
-
-RUN useradd -u 1000 -d /home/user user
diff --git a/dockerfiles/tasks/composer/Dockerfile-72 b/dockerfiles/tasks/composer/Dockerfile-72
index c785827..fc67357 100644
--- a/dockerfiles/tasks/composer/Dockerfile-72
+++ b/dockerfiles/tasks/composer/Dockerfile-72
@@ -22,8 +22,7 @@ RUN apt-get update && apt-get install -y software-properties-common python-softw
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
   && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
   && composer global require franzl/studio\
-  && mkdir /.composer && chmod -R 777 /.composer
+  && useradd -u 1000 -d /home/user user \
+  && mkdir -p /home/user/.composer && chmod -R 777 /home/user/.composer
 
 ENTRYPOINT ["/usr/local/bin/composer"]
-
-RUN useradd -u 1000 -d /home/user user