diff --git a/Dockerfile b/Dockerfile
index a9f0b53..b71582a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN { \
 #####
 # INSTALL COMPOSER
 #####
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 
 
 #####
@@ -46,17 +46,21 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 
 ENV INVOICENINJA_VERSION 4.3.1
 
+ENV COMPOSER_ALLOW_SUPERUSER=1
 RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja/archive/v${INVOICENINJA_VERSION}.tar.gz \
     && tar -xzf invoiceninja.tar.gz -C /var/www/ \
     && rm invoiceninja.tar.gz \
     && mv /var/www/invoiceninja-${INVOICENINJA_VERSION} /var/www/app \
     && chown -R www-data:www-data /var/www/app \
-    && composer install --working-dir /var/www/app -o --no-dev --no-interaction --no-progress \
+    && composer install --working-dir /var/www/app --no-suggest \
+                  --optimize-autoloader --no-interaction \
+                  --prefer-dist --no-progress --no-dev \
     && chown -R www-data:www-data /var/www/app/bootstrap/cache \
     && mv /var/www/app/storage /var/www/app/docker-backup-storage \
     && mv /var/www/app/public /var/www/app/docker-backup-public \
     && rm -rf /var/www/app/docs /var/www/app/tests \
-    && rm /usr/local/bin/composer
+    && composer clear-cache \
+    && rm /usr/bin/composer
 
 
 ######
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index fc15107..b10785c 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -51,14 +51,14 @@ RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja
     && mv /var/www/invoiceninja-${INVOICENINJA_VERSION} /var/www/app \
     && chown -R www-data:www-data /var/www/app \
     && composer install --working-dir /var/www/app --no-suggest \
-                  --optimize-autoloader --no-dev --no-interaction 
-                  --no-progress--prefer-dist --no-autoloader --no-progress \
+                  --optimize-autoloader --no-interaction \
+                  --prefer-dist --no-progress --no-dev \
     && chown -R www-data:www-data /var/www/app/bootstrap/cache \
     && mv /var/www/app/storage /var/www/app/docker-backup-storage \
     && mv /var/www/app/public /var/www/app/docker-backup-public \
     && rm -rf /var/www/app/docs /var/www/app/tests \
     && composer clear-cache \
-    && rm /usr/local/bin/composer
+    && rm /usr/bin/composer
 
 ######
 # DEFAULT ENV