diff --git a/README.md b/README.md
index 0acd2c0..8e78044 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 ## Current Images
 * latest/php7.4
+* php7.4
+* php7.4-composer-1
 * php7.3
 * php7.2
 
diff --git a/php7.2/Dockerfile b/php7.2/Dockerfile
index 8395ac5..ddcb18c 100644
--- a/php7.2/Dockerfile
+++ b/php7.2/Dockerfile
@@ -55,8 +55,7 @@ ENV PATH ./vendor/bin:/composer/vendor/bin:$PATH
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
 # Install composer
-RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
-  && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer && rm -rf /tmp/composer-setup.php
+COPY --from=composer:2.0 /usr/bin/composer /usr/local/bin/
 
 RUN wget -c https://phpmd.org/static/latest/phpmd.phar \
   && chmod +x phpmd.phar \
@@ -103,4 +102,4 @@ RUN SCVERSION="stable" \
 
 RUN npm -g install smmccabe/commercebot
 
-RUN apt-get update && apt-get install -y rsync  
+RUN apt-get update && apt-get install -y rsync
diff --git a/php7.3/Dockerfile b/php7.3/Dockerfile
index 960e11c..d931448 100644
--- a/php7.3/Dockerfile
+++ b/php7.3/Dockerfile
@@ -55,8 +55,7 @@ ENV PATH ./vendor/bin:/composer/vendor/bin:$PATH
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
 # Install composer
-RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
-  && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer && rm -rf /tmp/composer-setup.php
+COPY --from=composer:2.0 /usr/bin/composer /usr/local/bin/
 
 RUN wget -c https://phpmd.org/static/latest/phpmd.phar \
   && chmod +x phpmd.phar \
@@ -103,4 +102,4 @@ RUN SCVERSION="stable" \
 
 RUN npm -g install smmccabe/commercebot
 
-RUN apt-get update && apt-get install -y rsync  
+RUN apt-get update && apt-get install -y rsync
diff --git a/php7.4-composer-1/Dockerfile b/php7.4-composer-1/Dockerfile
index b69d285..6f0622a 100644
--- a/php7.4-composer-1/Dockerfile
+++ b/php7.4-composer-1/Dockerfile
@@ -9,7 +9,7 @@ RUN pecl install xdebug && docker-php-ext-enable xdebug
 RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h
 RUN rm -rf /var/lib/apt/lists/*
 RUN docker-php-ext-configure gd
-RUN docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip bcmath bz2 gmp soap xsl intl calendar 
+RUN docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip bcmath bz2 gmp soap xsl intl calendar
 RUN pecl install imagick && docker-php-ext-enable imagick
 RUN pecl install pcov && docker-php-ext-enable pcov
 
@@ -55,8 +55,7 @@ ENV PATH ./vendor/bin:/composer/vendor/bin:$PATH
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
 # Install composer
-RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
-  && php /tmp/composer-setup.php --version=1.10.17 --no-ansi --install-dir=/usr/local/bin --filename=composer && rm -rf /tmp/composer-setup.php
+COPY --from=composer:1.0 /usr/bin/composer /usr/local/bin/
 
 RUN wget -c https://phpmd.org/static/latest/phpmd.phar \
   && chmod +x phpmd.phar \
@@ -102,5 +101,5 @@ RUN SCVERSION="stable" \
   && rm -rf "shellcheck-${SCVERSION}"
 
 RUN npm -g install smmccabe/commercebot
-  
-RUN apt-get update && apt-get install -y rsync  
+
+RUN apt-get update && apt-get install -y rsync
diff --git a/php7.4/Dockerfile b/php7.4/Dockerfile
index 38f953a..c24b14f 100644
--- a/php7.4/Dockerfile
+++ b/php7.4/Dockerfile
@@ -9,7 +9,7 @@ RUN pecl install xdebug && docker-php-ext-enable xdebug
 RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h
 RUN rm -rf /var/lib/apt/lists/*
 RUN docker-php-ext-configure gd
-RUN docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip bcmath bz2 gmp soap xsl intl calendar 
+RUN docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip bcmath bz2 gmp soap xsl intl calendar
 RUN pecl install imagick && docker-php-ext-enable imagick
 RUN pecl install pcov && docker-php-ext-enable pcov
 
@@ -55,8 +55,7 @@ ENV PATH ./vendor/bin:/composer/vendor/bin:$PATH
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
 # Install composer
-RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
-  && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer && rm -rf /tmp/composer-setup.php
+COPY --from=composer:2.0 /usr/bin/composer /usr/local/bin/
 
 RUN wget -c https://phpmd.org/static/latest/phpmd.phar \
   && chmod +x phpmd.phar \
@@ -102,5 +101,5 @@ RUN SCVERSION="stable" \
   && rm -rf "shellcheck-${SCVERSION}"
 
 RUN npm -g install smmccabe/commercebot
-  
-RUN apt-get update && apt-get install -y rsync  
+
+RUN apt-get update && apt-get install -y rsync
diff --git a/php8.0/Dockerfile b/php8.0/Dockerfile
index 6eadc8e..4acbce1 100644
--- a/php8.0/Dockerfile
+++ b/php8.0/Dockerfile
@@ -9,7 +9,7 @@ RUN pecl install xdebug && docker-php-ext-enable xdebug
 RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h
 RUN rm -rf /var/lib/apt/lists/*
 RUN docker-php-ext-configure gd
-RUN docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip bcmath bz2 gmp soap xsl intl calendar 
+RUN docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip bcmath bz2 gmp soap xsl intl calendar
 RUN pecl install pcov && docker-php-ext-enable pcov
 
 # Switch back to PECL once a stable release is tagged
@@ -56,8 +56,7 @@ ENV PATH ./vendor/bin:/composer/vendor/bin:$PATH
 ENV COMPOSER_ALLOW_SUPERUSER 1
 
 # Install composer
-RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
-  && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer && rm -rf /tmp/composer-setup.php
+COPY --from=composer:2.0 /usr/bin/composer /usr/local/bin/
 
 RUN wget -c https://phpmd.org/static/latest/phpmd.phar \
   && chmod +x phpmd.phar \
@@ -103,5 +102,5 @@ RUN SCVERSION="stable" \
   && rm -rf "shellcheck-${SCVERSION}"
 
 RUN npm -g install smmccabe/commercebot
-  
-RUN apt-get update && apt-get install -y rsync  
+
+RUN apt-get update && apt-get install -y rsync