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 9e686062c895586f8ff06a04f845eb55fb5165a9..2451f3194364ccec2d084c1084959c1706018db7 100644
--- a/php/5.6/Dockerfile
+++ b/php/5.6/Dockerfile
@@ -4,14 +4,42 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip rsync subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install \
+      lsb-release \
+      zip \
+      unzip \
+      rsync \
+      subversion \
+      git \
+      libicu-dev \
+      libpng-dev \
+      libbz2-dev \
+      default-libmysqlclient-dev \
+      libzip-dev \
+      libonig-dev \
+      --fix-missing \
+      --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN docker-php-ext-install mbstring mysqli intl gd zip bz2
+RUN docker-php-ext-install \
+      mbstring \
+      mysqli \
+      intl \
+      gd \
+      zip \
+      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
-RUN chmod +x /usr/local/bin/composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && chmod +x /usr/local/bin/composer \
+    && composer --version \
+    && mkdir $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm --version
 
 ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/7.0/Dockerfile b/php/7.0/Dockerfile
index 2bcb2599be4e5e57c95d43d5b6c1feb4f4490b4f..2924c13c49f44e0d2d9be3e46a6785bc728b1a17 100644
--- a/php/7.0/Dockerfile
+++ b/php/7.0/Dockerfile
@@ -4,14 +4,42 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip rsync subversion git mysql-client libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install \
+      lsb-release \
+      zip \
+      unzip \
+      rsync \
+      subversion \
+      git \
+      libicu-dev \
+      libpng-dev \
+      libbz2-dev \
+      default-libmysqlclient-dev \
+      libzip-dev \
+      libonig-dev \
+      --fix-missing \
+      --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN docker-php-ext-install mbstring mysqli intl gd zip bz2
+RUN docker-php-ext-install \
+      mbstring \
+      mysqli \
+      intl \
+      gd \
+      zip \
+      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
-RUN chmod +x /usr/local/bin/composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && chmod +x /usr/local/bin/composer \
+    && composer --version \
+    && mkdir $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm --version
 
 ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/7.1/Dockerfile b/php/7.1/Dockerfile
index a7adfdd75a8b83fe80511a738eb75978a6f54555..580f37d9d9afc3ec65d673bbc8862ca349cb9a4d 100644
--- a/php/7.1/Dockerfile
+++ b/php/7.1/Dockerfile
@@ -4,14 +4,42 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip rsync subversion git libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-dev libonig-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install \
+      lsb-release \
+      zip \
+      unzip \
+      rsync \
+      subversion \
+      git \
+      libicu-dev \
+      libpng-dev \
+      libbz2-dev \
+      default-libmysqlclient-dev \
+      libzip-dev \
+      libonig-dev \
+      --fix-missing \
+      --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN docker-php-ext-install mbstring mysqli intl gd zip bz2
+RUN docker-php-ext-install \
+      mbstring \
+      mysqli \
+      intl \
+      gd \
+      zip \
+      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
-RUN chmod +x /usr/local/bin/composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && chmod +x /usr/local/bin/composer \
+    && composer --version \
+    && mkdir $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm --version
 
 ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/7.2/Dockerfile b/php/7.2/Dockerfile
index 367831f8b56bc237cc4837f337c4f1934c227a36..249f0b4203fb3db9143d63ca1e95674b2d18b8a6 100644
--- a/php/7.2/Dockerfile
+++ b/php/7.2/Dockerfile
@@ -4,14 +4,43 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip rsync subversion git libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-dev libonig-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install \
+      lsb-release \
+      zip \
+      unzip \
+      rsync \
+      subversion \
+      git \
+      libicu-dev \
+      libpng-dev \
+      libbz2-dev \
+      default-libmysqlclient-dev \
+      libzip-dev \
+      libonig-dev \
+      --fix-missing \
+      --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN docker-php-ext-install mbstring mysqli intl gd zip bz2
+RUN docker-php-ext-install \
+      mbstring \
+      mysqli \
+      intl \
+      gd \
+      zip \
+      bz2 \
+    && 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
-RUN chmod +x /usr/local/bin/composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && chmod +x /usr/local/bin/composer \
+    && composer --version \
+    && mkdir $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm --version
 
 ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/7.3/Dockerfile b/php/7.3/Dockerfile
index c486dae09732409eef0fcd088b6bf141909d2b76..908e677e050578f6d861bc38780a510a54dfb375 100644
--- a/php/7.3/Dockerfile
+++ b/php/7.3/Dockerfile
@@ -4,14 +4,43 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip rsync subversion git libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-dev libonig-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install \
+      lsb-release \
+      zip \
+      unzip \
+      rsync \
+      subversion \
+      git \
+      libicu-dev \
+      libpng-dev \
+      libbz2-dev \
+      default-libmysqlclient-dev \
+      libzip-dev \
+      libonig-dev \
+      --fix-missing \
+      --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN docker-php-ext-install mbstring mysqli intl gd zip bz2
+RUN docker-php-ext-install \
+      mbstring \
+      mysqli \
+      intl \
+      gd \
+      zip \
+      bz2 \
+    && 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
-RUN chmod +x /usr/local/bin/composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && chmod +x /usr/local/bin/composer \
+    && composer --version \
+    && mkdir $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm --version
 
 ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/7.4/Dockerfile b/php/7.4/Dockerfile
index 5f5ebcca93db8851f7be6276061c7a39572a785e..cfcbbf09371a457ec7a349efec2def790781f1a2 100644
--- a/php/7.4/Dockerfile
+++ b/php/7.4/Dockerfile
@@ -4,14 +4,43 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip rsync subversion git libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-dev libonig-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install \
+      lsb-release \
+      zip \
+      unzip \
+      rsync \
+      subversion \
+      git \
+      libicu-dev \
+      libpng-dev \
+      libbz2-dev \
+      default-libmysqlclient-dev \
+      libzip-dev \
+      libonig-dev \
+      --fix-missing \
+      --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN docker-php-ext-install mbstring mysqli intl gd zip bz2
+RUN docker-php-ext-install \
+      mbstring \
+      mysqli \
+      intl \
+      gd \
+      zip \
+      bz2 \
+    && 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
-RUN chmod +x /usr/local/bin/composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && chmod +x /usr/local/bin/composer \
+    && composer --version \
+    && mkdir $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm --version
 
 ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/8.0/Dockerfile b/php/8.0/Dockerfile
index 0beaf6694337be89e1cb436f999c8aa06dc4fcc9..a4f5f10787caa71d44af6d81001855e1acb80d2f 100644
--- a/php/8.0/Dockerfile
+++ b/php/8.0/Dockerfile
@@ -4,14 +4,43 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip rsync subversion git libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-dev libonig-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install \
+      lsb-release \
+      zip \
+      unzip \
+      rsync \
+      subversion \
+      git \
+      libicu-dev \
+      libpng-dev \
+      libbz2-dev \
+      default-libmysqlclient-dev \
+      libzip-dev \
+      libonig-dev \
+      --fix-missing \
+      --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN docker-php-ext-install mbstring mysqli intl gd zip bz2
+RUN docker-php-ext-install \
+      mbstring \
+      mysqli \
+      intl \
+      gd \
+      zip \
+      bz2 \
+    && 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
-RUN chmod +x /usr/local/bin/composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && chmod +x /usr/local/bin/composer \
+    && composer --version \
+    && mkdir $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm --version
 
 ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/8.1/Dockerfile b/php/8.1/Dockerfile
index 4b55961af52aae31c609a7c7b59cc72ed9bed213..f7b79e065520719ff61da83c8b08345941e93252 100644
--- a/php/8.1/Dockerfile
+++ b/php/8.1/Dockerfile
@@ -4,14 +4,43 @@ LABEL maintainer="ethitter"
 LABEL version="1.0"
 
 RUN apt-get update \
-    && apt-get -yqqf install lsb-release zip unzip rsync subversion git libicu-dev libpng-dev libbz2-dev default-libmysqlclient-dev libzip-dev libonig-dev --fix-missing --no-install-recommends \
+    && apt-get -yqqf install \
+      lsb-release \
+      zip \
+      unzip \
+      rsync \
+      subversion \
+      git \
+      libicu-dev \
+      libpng-dev \
+      libbz2-dev \
+      default-libmysqlclient-dev \
+      libzip-dev \
+      libonig-dev \
+      --fix-missing \
+      --no-install-recommends \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN docker-php-ext-install mbstring mysqli intl gd zip bz2
+RUN docker-php-ext-install \
+      mbstring \
+      mysqli \
+      intl \
+      gd \
+      zip \
+      bz2 \
+    && 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
-RUN chmod +x /usr/local/bin/composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && chmod +x /usr/local/bin/composer \
+    && composer --version \
+    && mkdir $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm --version
 
 ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH