diff --git a/2.3.1/Dockerfile b/2.3.1/Dockerfile
index 50259a7..f05005c 100644
--- a/2.3.1/Dockerfile
+++ b/2.3.1/Dockerfile
@@ -4,9 +4,12 @@ LABEL maintainer="contact@ocsinventory-ng.org"
 LABEL version="2.3.1"
 LABEL description="OCS (Open Computers and Software Inventory Next Generation)"
 
-RUN apt-get update
+ARG APT_FLAGS="-y --no-install-recommends"
 
-RUN apt-get -y install \
+VOLUME /var/lib/mysql
+
+RUN apt-get update ; \
+    apt-get ${APT_FLAGS} install \
     apache2 \
     apache2-doc \
     apt-utils \
@@ -35,33 +38,27 @@ RUN apt-get -y install \
     libphp-pclzip \
     libsoap-lite-perl \
     libarchive-zip-perl \
+    libmodule-build-perl \
     wget \
     tar \
-    make
-
-RUN cpan -i XML::Entities
-VOLUME /var/lib/mysql
-
-RUN cp /usr/share/zoneinfo/Europe/Paris /etc/localtime
-
-RUN /usr/sbin/a2dissite 000-default ;\
+    make ;\
+    cpan -i XML::Entities ;\
+    /usr/sbin/a2dissite 000-default ;\
     /usr/sbin/a2enmod rewrite ;\
     /usr/sbin/a2enmod ssl ;\
-    /usr/sbin/a2enmod authz_user
-
-RUN wget https://raw.githubusercontent.com/OCSInventory-NG/OCSInventory-Server/master/binutils/docker-download.sh
-RUN sh docker-download.sh 2.3.1
+    /usr/sbin/a2enmod authz_user ;\
+    wget https://raw.githubusercontent.com/OCSInventory-NG/OCSInventory-Server/master/binutils/docker-download.sh ;\
+    sh docker-download.sh 2.3.1
 
 WORKDIR /tmp/ocs/Apache
 RUN perl Makefile.PL ;\
     make ;\
-    make install
-
-RUN cp -R blib/lib/Apache /usr/local/share/perl/5.20.2/ ;\
+    make install ;\
+    cp /usr/share/zoneinfo/Europe/Paris /etc/localtime ;\
+    cp -R blib/lib/Apache /usr/local/share/perl/5.20.2/ ;\
     cp -R Ocsinventory /usr/local/share/perl/5.20.2/ ;\
-    cp /tmp/ocs/etc/logrotate.d/ocsinventory-server /etc/logrotate.d/
-
-RUN mkdir -p /etc/ocsinventory-server/plugins ;\
+    cp /tmp/ocs/etc/logrotate.d/ocsinventory-server /etc/logrotate.d/ ;\
+    mkdir -p /etc/ocsinventory-server/plugins ;\
     mkdir -p /etc/ocsinventory-server/perl ;\
     mkdir -p /usr/share/ocsinventory-reports/ocsreports
 
@@ -76,40 +73,32 @@ ENV APACHE_LOG_DIR      /var/log/apache2
 
 WORKDIR /tmp/ocs
 
-RUN cp -R ocsreports/* /usr/share/ocsinventory-reports/ocsreports
-
-RUN bash -c 'mkdir -p /var/lib/ocsinventory-reports/{download,ipd,logs,scripts,snmp}'
-
-RUN chmod -R +w /var/lib/ocsinventory-reports ;\
-    chown www-data: -R /var/lib/ocsinventory-reports
-
 COPY dbconfig.inc.php /usr/share/ocsinventory-reports/ocsreports/
 
-RUN cp binutils/ipdiscover-util.pl /usr/share/ocsinventory-reports/ocsreports/ipdiscover-util.pl
-
-RUN chown www-data: /usr/share/ocsinventory-reports/ocsreports/ipdiscover-util.pl ;\
+RUN cp -R ocsreports/* /usr/share/ocsinventory-reports/ocsreports ;\
+    bash -c 'mkdir -p /var/lib/ocsinventory-reports/{download,ipd,logs,scripts,snmp}' ;\
+    chmod -R +w /var/lib/ocsinventory-reports ;\
+    chown www-data: -R /var/lib/ocsinventory-reports ;\
+    cp binutils/ipdiscover-util.pl /usr/share/ocsinventory-reports/ocsreports/ipdiscover-util.pl ;\
+    chown www-data: /usr/share/ocsinventory-reports/ocsreports/ipdiscover-util.pl ;\
     chmod 755 /usr/share/ocsinventory-reports/ocsreports/ipdiscover-util.pl ;\
     chmod +w /usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php ;\
     mkdir -p /var/log/ocsinventory-server/ ;\
     chmod +w /var/log/ocsinventory-server ;\
     chown -R www-data: /usr/share/ocsinventory-reports/
 
-COPY /conf/ocsinventory-reports.conf /etc/apache2/conf-available/
-COPY /conf/z-ocsinventory-server.conf /etc/apache2/conf-available/
-
-
+COPY /conf/ocsinventory-reports.conf /conf/z-ocsinventory-server.conf /etc/apache2/conf-available/
 COPY ./scripts/run.sh /root/run.sh
-RUN chmod +x /root/run.sh
 
-
-RUN ln -s /etc/apache2/conf-available/ocsinventory-reports.conf /etc/apache2/conf-enabled/ocsinventory-reports.conf
-RUN ln -s /etc/apache2/conf-available/z-ocsinventory-server.conf /etc/apache2/conf-enabled/z-ocsinventory-server.conf
-
-RUN rm /usr/share/ocsinventory-reports/ocsreports/install.php ;\
+RUN chmod +x /root/run.sh ;\
+    ln -s /etc/apache2/conf-available/ocsinventory-reports.conf /etc/apache2/conf-enabled/ocsinventory-reports.conf ;\
+    ln -s /etc/apache2/conf-available/z-ocsinventory-server.conf /etc/apache2/conf-enabled/z-ocsinventory-server.conf ;\
+    rm /usr/share/ocsinventory-reports/ocsreports/install.php ;\
     rm -rf /tmp/ocs ;\
     apt-get clean ;\
     apt-get autoclean ;\
     apt-get autoremove ;\
+    rm -rf /var/lib/apt/lists/* ;\
     rm -rf /var/cache/apt/archives/* ;
 
 EXPOSE 80