diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d75c3dc90eeff4eb2995295cbc6080f38e620379..78464663a31ef7a8c6bf67ffddd9877918ef2690 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -268,7 +268,6 @@ build-php-7.0-dev:
     - docker push "$CI_REGISTRY_IMAGE/php:7.0-dev"
   except:
     - master
-  allow_failure: true
 
 # PHP 5.6
 build-php-5.6-master:
@@ -287,4 +286,3 @@ build-php-5.6-dev:
     - docker push "$CI_REGISTRY_IMAGE/php:5.6-dev"
   except:
     - master
-  allow_failure: true
diff --git a/php/5.6/Dockerfile b/php/5.6/Dockerfile
index ea0fcd809108212b583f362aa8579efa92d44d9b..2451f3194364ccec2d084c1084959c1706018db7 100644
--- a/php/5.6/Dockerfile
+++ b/php/5.6/Dockerfile
@@ -31,6 +31,8 @@ RUN docker-php-ext-install \
       bz2 \
     && php -m
 
+ENV NVM_DIR /usr/local/nvm
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && chmod +x /usr/local/bin/composer \
diff --git a/php/7.0/Dockerfile b/php/7.0/Dockerfile
index 72fa36ec1e148211da6c57a44e53ba7ad5a1229e..2924c13c49f44e0d2d9be3e46a6785bc728b1a17 100644
--- a/php/7.0/Dockerfile
+++ b/php/7.0/Dockerfile
@@ -31,6 +31,8 @@ RUN docker-php-ext-install \
       bz2 \
     && php -m
 
+ENV NVM_DIR /usr/local/nvm
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && chmod +x /usr/local/bin/composer \
diff --git a/php/7.1/Dockerfile b/php/7.1/Dockerfile
index 78dbd259c5f6e285d78656eeefef18d7d5099bf2..580f37d9d9afc3ec65d673bbc8862ca349cb9a4d 100644
--- a/php/7.1/Dockerfile
+++ b/php/7.1/Dockerfile
@@ -31,6 +31,8 @@ RUN docker-php-ext-install \
       bz2 \
     && php -m
 
+ENV NVM_DIR /usr/local/nvm
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && chmod +x /usr/local/bin/composer \
diff --git a/php/7.2/Dockerfile b/php/7.2/Dockerfile
index b76b3a4fa49820874eeb9e30f59df91c2fea8227..249f0b4203fb3db9143d63ca1e95674b2d18b8a6 100644
--- a/php/7.2/Dockerfile
+++ b/php/7.2/Dockerfile
@@ -32,6 +32,8 @@ RUN docker-php-ext-install \
     && pecl install xdebug \
     && php -m
 
+ENV NVM_DIR /usr/local/nvm
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && chmod +x /usr/local/bin/composer \
diff --git a/php/7.3/Dockerfile b/php/7.3/Dockerfile
index 696c8c8b46c78614dc6da6582bea0a0d5ef2faa6..908e677e050578f6d861bc38780a510a54dfb375 100644
--- a/php/7.3/Dockerfile
+++ b/php/7.3/Dockerfile
@@ -32,6 +32,8 @@ RUN docker-php-ext-install \
     && pecl install xdebug \
     && php -m
 
+ENV NVM_DIR /usr/local/nvm
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && chmod +x /usr/local/bin/composer \
diff --git a/php/7.4/Dockerfile b/php/7.4/Dockerfile
index 96672f689f263eef68722e36c13dc632ba98fa09..cfcbbf09371a457ec7a349efec2def790781f1a2 100644
--- a/php/7.4/Dockerfile
+++ b/php/7.4/Dockerfile
@@ -32,6 +32,8 @@ RUN docker-php-ext-install \
     && pecl install xdebug \
     && php -m
 
+ENV NVM_DIR /usr/local/nvm
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && chmod +x /usr/local/bin/composer \
diff --git a/php/8.1/Dockerfile b/php/8.1/Dockerfile
index 2d057770e92b17bb7b898c8c0cce4ca9c3427c91..f7b79e065520719ff61da83c8b08345941e93252 100644
--- a/php/8.1/Dockerfile
+++ b/php/8.1/Dockerfile
@@ -32,6 +32,8 @@ RUN docker-php-ext-install \
     && pecl install xdebug \
     && php -m
 
+ENV NVM_DIR /usr/local/nvm
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && chmod +x /usr/local/bin/composer \