diff --git a/php/5.6/Dockerfile b/php/5.6/Dockerfile
index 9e686062c895586f8ff06a04f845eb55fb5165a9..960c1f71bb74f1efd96c34ccb5bd5cd513bbec73 100644
--- a/php/5.6/Dockerfile
+++ b/php/5.6/Dockerfile
@@ -4,14 +4,36 @@ 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 \
+    && pecl install xdebug \
+    && php -m
 
 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
 
 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..d4b7cf1848922898ddfe5fcd7f692349e1fbbc05 100644
--- a/php/7.0/Dockerfile
+++ b/php/7.0/Dockerfile
@@ -4,14 +4,36 @@ 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 \
+    && pecl install xdebug \
+    && php -m
 
 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
 
 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..bff65952b81a33dca278e8d9eb68dd5413291987 100644
--- a/php/7.1/Dockerfile
+++ b/php/7.1/Dockerfile
@@ -4,14 +4,36 @@ 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
 
 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
 
 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..e24819f014cc87d79a872c1121be181891c58506 100644
--- a/php/7.2/Dockerfile
+++ b/php/7.2/Dockerfile
@@ -4,14 +4,36 @@ 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
 
 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
 
 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..bf96670ac9d9425ad0b77c394a5cb108b18f2d1c 100644
--- a/php/7.3/Dockerfile
+++ b/php/7.3/Dockerfile
@@ -4,14 +4,36 @@ 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
 
 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
 
 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..5b951ff261d0329d4c216c04c24456507039b204 100644
--- a/php/7.4/Dockerfile
+++ b/php/7.4/Dockerfile
@@ -4,14 +4,36 @@ 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
 
 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
 
 ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH
diff --git a/php/8.0/Dockerfile b/php/8.0/Dockerfile
index 21cb03d01ec0d5f2ce2eda67ee108beda9188ac9..bb262cdc45bef19c7ba16abc25ab203379312280 100644
--- a/php/8.0/Dockerfile
+++ b/php/8.0/Dockerfile
@@ -4,16 +4,36 @@ 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 -i
+    && php -m
 
 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
 
 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..2db636703d043b3667ba197699b3e155c1729a20 100644
--- a/php/8.1/Dockerfile
+++ b/php/8.1/Dockerfile
@@ -4,14 +4,36 @@ 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
 
 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
 
 ENV PATH=/root/.composer/vendor/bin:$HOME/.composer/vendor/bin:$PATH