diff --git a/.docker/httpd.Dockerfile b/.docker/httpd.Dockerfile
index 88f8ba9ab67fa74cd5c685366c8a25f2fdfa1bb2..9afef9c176f6087965fab39c2fdf2ae400165215 100644
--- a/.docker/httpd.Dockerfile
+++ b/.docker/httpd.Dockerfile
@@ -1,44 +1,46 @@
 # -*- coding: utf-8 -*-
 
 FROM httpd:2.4.57-alpine3.17
+
 LABEL authors="Nicolas Béjean <nicolas@bejean.fr>"
 LABEL company="Béjean Développement"
 LABEL website="www.bejean.eu"
 LABEL version="1.0"
 
-# Créé l'utilisateur app
+# Addgroup and adduser
 RUN addgroup -g 1000 app \
 && adduser -D -H -h /var/www -s /sbin/nologin -G app -u 1000 app
 
 # Change port 80 to 8000
 RUN sed -i 's/Listen 80/Listen 8000/g' /usr/local/apache2/conf/httpd.conf
 
-# Change user adn group www-data to app
+# Change user and group www-data to app
 RUN sed -i 's/User www-data/User app/g' /usr/local/apache2/conf/httpd.conf
 RUN sed -i 's/Group www-data/Group app/g' /usr/local/apache2/conf/httpd.conf
 
 # Update server name
 RUN sed -i 's/^#ServerName.*/ServerName localhost:8000/' /usr/local/apache2/conf/httpd.conf
 
-# Active le module proxy
+# Enable proxy and fcgi modules
 RUN sed -i 's/^#\(LoadModule proxy_module modules\/mod_proxy.so\)/\1/' /usr/local/apache2/conf/httpd.conf
 RUN sed -i 's/^#\(LoadModule proxy_fcgi_module modules\/mod_proxy_fcgi.so\)/\1/' /usr/local/apache2/conf/httpd.conf
 
+# Add vhost configuration and copye vhost file
 RUN sed -i 's/#Include\ conf\/extra\/httpd-vhosts.conf/Include\ conf\/extra\/httpd-vhosts.conf/' /usr/local/apache2/conf/httpd.conf
-
 COPY conf/httpd-vhosts.conf /usr/local/apache2/conf/extra/httpd-vhosts.conf
 
-# Créé les répertoies et assigne les droits
+# Create directories and upate permissions
 RUN mkdir -p /var/www/html \
 && chown -R app:app /var/www/html /usr/local/apache2/logs
 
-# Modifie le user de l'image
+# Change owner and group
 USER app:app
 
-# Change le répertoire de travail
-WORKDIR /usr/local/apache2/htdocs
+# Change workdir
+WORKDIR /var/www/html
 
-# Expose le port 8000
+# Expose port 8000
 EXPOSE 8000
 
+# Start apache
 CMD /usr/local/apache2/bin/httpd -D FOREGROUND
diff --git a/.docker/phpfpm.Dockerfile b/.docker/phpfpm.Dockerfile
index 9a89428eec33dc595151f56d7b72685537022adb..87f2d5589f11c95fba4787a51dfd59337f2aba20 100644
--- a/.docker/phpfpm.Dockerfile
+++ b/.docker/phpfpm.Dockerfile
@@ -1,33 +1,38 @@
 # -*- coding: utf-8 -*-
 
 FROM php:8.1.18-fpm-alpine3.17
+
 LABEL authors="Nicolas Béjean <nicolas@bejean.fr>"
 LABEL company="Béjean Développement"
 LABEL website="www.bejean.eu"
 LABEL version="1.0"
 
-ENV TZ=Europe/Paris
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+# Addgroup and adduser
+RUN addgroup -g 1000 app \
+  && adduser -D -H -h /var/www -s /sbin/nologin -G app -u 1000 app
 
-# Update cache system packages
-RUN apk --no-cache --no-progress upgrade > /dev/null
+# Change listen parameter
+RUN sed -i 's/^listen = 127.0.0.1:9000*/listen = 9000/' /usr/local/etc/php-fpm.d/www.conf
 
+# Change user and group www-data to app
 RUN sed -i 's/^user = www-data*/user = app/' /usr/local/etc/php-fpm.d/www.conf
 RUN sed -i 's/^group = www-data*/group = app/' /usr/local/etc/php-fpm.d/www.conf
-
-RUN sed -i 's/^listen = 127.0.0.1:9000*/listen = 9000/' /usr/local/etc/php-fpm.d/www.conf
 RUN sed -i 's/^;listen.owner = www-data*/listen.owner = app/' /usr/local/etc/php-fpm.d/www.conf
 RUN sed -i 's/^;listen.group = www-data*/listen.group = app/' /usr/local/etc/php-fpm.d/www.conf
 
-# Création de l'utilisateur app
-RUN addgroup -g 1000 app \
-  && adduser -D -H -h /var/www -s /sbin/nologin -G app -u 1000 app
+# Set timezone
+ENV TZ=Europe/Paris
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
+# Create directories and upate permissions
 RUN mkdir -p /var/www/html /sock /var/log/php \
   && chown -R app:app /var/www /usr/local/etc /sock /var/log/php
 
-RUN chown -R app:app /var/www/html/
-
+# Change owner and group
 USER app:app
 
+# Change workdir
 WORKDIR /var/www/html
+
+# Expose port 9000
+EXPOSE 9000