diff --git a/5.4/Dockerfile b/5.4/Dockerfile
index d90bac5..4c08967 100644
--- a/5.4/Dockerfile
+++ b/5.4/Dockerfile
@@ -33,6 +33,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile
index 8f51056..6b74e1b 100644
--- a/5.4/apache/Dockerfile
+++ b/5.4/apache/Dockerfile
@@ -34,6 +34,6 @@ RUN buildDeps=" \
     && a2enmod rewrite
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/5.4/fpm/Dockerfile b/5.4/fpm/Dockerfile
index 0c3b23d..51c87c4 100644
--- a/5.4/fpm/Dockerfile
+++ b/5.4/fpm/Dockerfile
@@ -33,6 +33,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/5.5/Dockerfile b/5.5/Dockerfile
index dd45887..66088f5 100644
--- a/5.5/Dockerfile
+++ b/5.5/Dockerfile
@@ -33,6 +33,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile
index 59cfce3..cc2005c 100644
--- a/5.5/apache/Dockerfile
+++ b/5.5/apache/Dockerfile
@@ -34,6 +34,6 @@ RUN buildDeps=" \
     && a2enmod rewrite
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile
index f40695b..8b70c75 100644
--- a/5.5/fpm/Dockerfile
+++ b/5.5/fpm/Dockerfile
@@ -33,6 +33,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
index de14762..df8bc84 100644
--- a/5.6/Dockerfile
+++ b/5.6/Dockerfile
@@ -33,6 +33,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile
index be9817c..b732b9c 100644
--- a/5.6/apache/Dockerfile
+++ b/5.6/apache/Dockerfile
@@ -34,6 +34,6 @@ RUN buildDeps=" \
     && a2enmod rewrite
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile
index 77ee3bd..716fcc9 100644
--- a/5.6/fpm/Dockerfile
+++ b/5.6/fpm/Dockerfile
@@ -33,6 +33,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/7.0/Dockerfile b/7.0/Dockerfile
index 921b0cd..2713b5b 100644
--- a/7.0/Dockerfile
+++ b/7.0/Dockerfile
@@ -33,6 +33,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile
index a799c63..1bd5dd4 100644
--- a/7.0/apache/Dockerfile
+++ b/7.0/apache/Dockerfile
@@ -34,6 +34,6 @@ RUN buildDeps=" \
     && a2enmod rewrite
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile
index 62084d2..e8a3fc1 100644
--- a/7.0/fpm/Dockerfile
+++ b/7.0/fpm/Dockerfile
@@ -33,6 +33,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/7.1/Dockerfile b/7.1/Dockerfile
index d7d32d0..cb5ee38 100644
--- a/7.1/Dockerfile
+++ b/7.1/Dockerfile
@@ -33,6 +33,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/7.1/apache/Dockerfile b/7.1/apache/Dockerfile
index 1ed97af..0d876ac 100644
--- a/7.1/apache/Dockerfile
+++ b/7.1/apache/Dockerfile
@@ -34,6 +34,6 @@ RUN buildDeps=" \
     && a2enmod rewrite
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/7.1/fpm/Dockerfile b/7.1/fpm/Dockerfile
index d32a100..c9680c0 100644
--- a/7.1/fpm/Dockerfile
+++ b/7.1/fpm/Dockerfile
@@ -33,6 +33,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/7.2/Dockerfile b/7.2/Dockerfile
index 5a4c381..283c690 100644
--- a/7.2/Dockerfile
+++ b/7.2/Dockerfile
@@ -32,6 +32,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/7.2/apache/Dockerfile b/7.2/apache/Dockerfile
index 58075d1..ac7c8e5 100644
--- a/7.2/apache/Dockerfile
+++ b/7.2/apache/Dockerfile
@@ -33,6 +33,6 @@ RUN buildDeps=" \
     && a2enmod rewrite
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/7.2/fpm/Dockerfile b/7.2/fpm/Dockerfile
index 67b0459..6800752 100644
--- a/7.2/fpm/Dockerfile
+++ b/7.2/fpm/Dockerfile
@@ -32,6 +32,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH
diff --git a/Dockerfile b/Dockerfile
index a610ec1..eff35a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,6 +32,6 @@ RUN buildDeps=" \
     && rm -r /var/lib/apt/lists/*
 
 # Install Composer.
-ENV COMPOSER_HOME /root/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
+RUN ln -s $(composer config --global home) /root/composer
+ENV PATH /root/composer/vendor/bin:$PATH