diff --git a/php/7.4/cli/Dockerfile b/php/7.4/cli/Dockerfile
index a8cb074..e40f3d8 100644
--- a/php/7.4/cli/Dockerfile
+++ b/php/7.4/cli/Dockerfile
@@ -1,14 +1,23 @@
-FROM axllent/mailpit as mailpit
 FROM serversideup/php:7.4-cli
 
-# Xdebug compatibility: https://xdebug.org/docs/compat
-# Use Xdebug for debugging and generating code coverage reports.
-ENV PHP_XDEBUG_VERSION 3.1.6
-
-# Install the PHP extensions.
-RUN pecl install "xdebug-${PHP_XDEBUG_VERSION}"; \
-    docker-php-ext-enable xdebug; \
-    php -m;
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+    php7.4-xdebug \
+# Require to be able to interact with Git, such as clone, pull, and push to the remote repositories
+# e.g. when developing within the container with devcontainer
+    git \
+    ssh \
+# Required for Composer to unpack ZIP archives that otherwise throws the following warning:
+# As there is no 'unzip' nor '7z' command installed zip files are being unpacked using the PHP zip extension.
+# This may cause invalid reports of corrupted archives. Besides, any UNIX permissions (e.g. executable) defined in the archives will be lost.
+# Installing 'unzip' or '7z' (21.01+) may remediate them.
+    unzip \
+	; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
+  php -m;
 
 # VSCode configs
 RUN mkdir -p /var/www/.vscode-server; \
diff --git a/php/7.4/fpm/Dockerfile b/php/7.4/fpm/Dockerfile
index 240e65e..01d8079 100644
--- a/php/7.4/fpm/Dockerfile
+++ b/php/7.4/fpm/Dockerfile
@@ -1,14 +1,23 @@
-FROM axllent/mailpit as mailpit
 FROM serversideup/php:7.4-fpm
 
-# Xdebug compatibility: https://xdebug.org/docs/compat
-# Use Xdebug for debugging and generating code coverage reports.
-ENV PHP_XDEBUG_VERSION 3.1.6
-
-# Install the PHP extensions.
-RUN pecl install "xdebug-${PHP_XDEBUG_VERSION}"; \
-    docker-php-ext-enable xdebug; \
-    php -m;
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+    php7.4-xdebug \
+# Require to be able to interact with Git, such as clone, pull, and push to the remote repositories
+# e.g. when developing within the container with devcontainer
+    git \
+    ssh \
+# Required for Composer to unpack ZIP archives that otherwise throws the following warning:
+# As there is no 'unzip' nor '7z' command installed zip files are being unpacked using the PHP zip extension.
+# This may cause invalid reports of corrupted archives. Besides, any UNIX permissions (e.g. executable) defined in the archives will be lost.
+# Installing 'unzip' or '7z' (21.01+) may remediate them.
+    unzip \
+	; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
+  php -m;
 
 # VSCode configs
 RUN mkdir -p /var/www/.vscode-server; \
diff --git a/php/8.0/cli/Dockerfile b/php/8.0/cli/Dockerfile
index 3c580fc..dc5cff8 100644
--- a/php/8.0/cli/Dockerfile
+++ b/php/8.0/cli/Dockerfile
@@ -1,14 +1,23 @@
-FROM axllent/mailpit as mailpit
 FROM serversideup/php:8.0-cli
 
-# Xdebug compatibility: https://xdebug.org/docs/compat
-# Use Xdebug for debugging and generating code coverage reports.
-ENV PHP_XDEBUG_VERSION 3.3.0
-
-# Install the PHP extensions.
-RUN pecl install "xdebug-${PHP_XDEBUG_VERSION}"; \
-    docker-php-ext-enable xdebug; \
-    php -m;
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+    php8.0-xdebug \
+# Require to be able to interact with Git, such as clone, pull, and push to the remote repositories
+# e.g. when developing within the container with devcontainer
+    git \
+    ssh \
+# Required for Composer to unpack ZIP archives that otherwise throws the following warning:
+# As there is no 'unzip' nor '7z' command installed zip files are being unpacked using the PHP zip extension.
+# This may cause invalid reports of corrupted archives. Besides, any UNIX permissions (e.g. executable) defined in the archives will be lost.
+# Installing 'unzip' or '7z' (21.01+) may remediate them.
+    unzip \
+	; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
+  php -m;
 
 # VSCode configs
 RUN mkdir -p /var/www/.vscode-server; \
diff --git a/php/8.0/fpm/Dockerfile b/php/8.0/fpm/Dockerfile
index 7fb8b03..c60340a 100644
--- a/php/8.0/fpm/Dockerfile
+++ b/php/8.0/fpm/Dockerfile
@@ -1,14 +1,23 @@
-FROM axllent/mailpit as mailpit
 FROM serversideup/php:8.0-fpm
 
-# Xdebug compatibility: https://xdebug.org/docs/compat
-# Use Xdebug for debugging and generating code coverage reports.
-ENV PHP_XDEBUG_VERSION 3.3.0
-
-# Install the PHP extensions.
-RUN pecl install "xdebug-${PHP_XDEBUG_VERSION}"; \
-    docker-php-ext-enable xdebug; \
-    php -m;
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+    php8.0-xdebug \
+# Require to be able to interact with Git, such as clone, pull, and push to the remote repositories
+# e.g. when developing within the container with devcontainer
+    git \
+    ssh \
+# Required for Composer to unpack ZIP archives that otherwise throws the following warning:
+# As there is no 'unzip' nor '7z' command installed zip files are being unpacked using the PHP zip extension.
+# This may cause invalid reports of corrupted archives. Besides, any UNIX permissions (e.g. executable) defined in the archives will be lost.
+# Installing 'unzip' or '7z' (21.01+) may remediate them.
+    unzip \
+	; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
+  php -m;
 
 # VSCode configs
 RUN mkdir -p /var/www/.vscode-server; \
diff --git a/php/8.1/cli/Dockerfile b/php/8.1/cli/Dockerfile
index b7a5386..ea25fde 100644
--- a/php/8.1/cli/Dockerfile
+++ b/php/8.1/cli/Dockerfile
@@ -1,14 +1,23 @@
-FROM axllent/mailpit as mailpit
-FROM serversideup/php:8.1-cli
+FROM serversideup/php:8.1-fpm
 
-# Xdebug compatibility: https://xdebug.org/docs/compat
-# Use Xdebug for debugging and generating code coverage reports.
-ENV PHP_XDEBUG_VERSION 3.3.0
-
-# Install the PHP extensions.
-RUN pecl install "xdebug-${PHP_XDEBUG_VERSION}"; \
-    docker-php-ext-enable xdebug; \
-    php -m;
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+    php8.1-xdebug \
+# Require to be able to interact with Git, such as clone, pull, and push to the remote repositories
+# e.g. when developing within the container with devcontainer
+    git \
+    ssh \
+# Required for Composer to unpack ZIP archives that otherwise throws the following warning:
+# As there is no 'unzip' nor '7z' command installed zip files are being unpacked using the PHP zip extension.
+# This may cause invalid reports of corrupted archives. Besides, any UNIX permissions (e.g. executable) defined in the archives will be lost.
+# Installing 'unzip' or '7z' (21.01+) may remediate them.
+    unzip \
+	; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
+  php -m;
 
 # VSCode configs
 RUN mkdir -p /var/www/.vscode-server; \
diff --git a/php/8.1/fpm/Dockerfile b/php/8.1/fpm/Dockerfile
index 03c5e8e..ea25fde 100644
--- a/php/8.1/fpm/Dockerfile
+++ b/php/8.1/fpm/Dockerfile
@@ -1,14 +1,23 @@
-FROM axllent/mailpit as mailpit
 FROM serversideup/php:8.1-fpm
 
-# Xdebug compatibility: https://xdebug.org/docs/compat
-# Use Xdebug for debugging and generating code coverage reports.
-ENV PHP_XDEBUG_VERSION 3.3.0
-
-# Install the PHP extensions.
-RUN pecl install "xdebug-${PHP_XDEBUG_VERSION}"; \
-    docker-php-ext-enable xdebug; \
-    php -m;
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+    php8.1-xdebug \
+# Require to be able to interact with Git, such as clone, pull, and push to the remote repositories
+# e.g. when developing within the container with devcontainer
+    git \
+    ssh \
+# Required for Composer to unpack ZIP archives that otherwise throws the following warning:
+# As there is no 'unzip' nor '7z' command installed zip files are being unpacked using the PHP zip extension.
+# This may cause invalid reports of corrupted archives. Besides, any UNIX permissions (e.g. executable) defined in the archives will be lost.
+# Installing 'unzip' or '7z' (21.01+) may remediate them.
+    unzip \
+	; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
+  php -m;
 
 # VSCode configs
 RUN mkdir -p /var/www/.vscode-server; \
diff --git a/php/8.2/cli/Dockerfile b/php/8.2/cli/Dockerfile
index 6485b61..055b3ed 100644
--- a/php/8.2/cli/Dockerfile
+++ b/php/8.2/cli/Dockerfile
@@ -1,14 +1,23 @@
-FROM axllent/mailpit as mailpit
 FROM serversideup/php:8.2-cli
 
-# Xdebug compatibility: https://xdebug.org/docs/compat
-# Use Xdebug for debugging and generating code coverage reports.
-ENV PHP_XDEBUG_VERSION 3.3.0
-
-# Install the PHP extensions.
-RUN pecl install "xdebug-${PHP_XDEBUG_VERSION}"; \
-    docker-php-ext-enable xdebug; \
-    php -m;
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+    php8.2-xdebug \
+# Require to be able to interact with Git, such as clone, pull, and push to the remote repositories
+# e.g. when developing within the container with devcontainer
+    git \
+    ssh \
+# Required for Composer to unpack ZIP archives that otherwise throws the following warning:
+# As there is no 'unzip' nor '7z' command installed zip files are being unpacked using the PHP zip extension.
+# This may cause invalid reports of corrupted archives. Besides, any UNIX permissions (e.g. executable) defined in the archives will be lost.
+# Installing 'unzip' or '7z' (21.01+) may remediate them.
+    unzip \
+	; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
+  php -m;
 
 # VSCode configs
 RUN mkdir -p /var/www/.vscode-server; \
diff --git a/php/8.2/fpm/Dockerfile b/php/8.2/fpm/Dockerfile
index e2b8b0a..d64efe0 100644
--- a/php/8.2/fpm/Dockerfile
+++ b/php/8.2/fpm/Dockerfile
@@ -1,14 +1,23 @@
-FROM axllent/mailpit as mailpit
 FROM serversideup/php:8.2-fpm
 
-# Xdebug compatibility: https://xdebug.org/docs/compat
-# Use Xdebug for debugging and generating code coverage reports.
-ENV PHP_XDEBUG_VERSION 3.3.0
-
-# Install the PHP extensions.
-RUN pecl install "xdebug-${PHP_XDEBUG_VERSION}"; \
-    docker-php-ext-enable xdebug; \
-    php -m;
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+    php8.2-xdebug \
+# Require to be able to interact with Git, such as clone, pull, and push to the remote repositories
+# e.g. when developing within the container with devcontainer
+    git \
+    ssh \
+# Required for Composer to unpack ZIP archives that otherwise throws the following warning:
+# As there is no 'unzip' nor '7z' command installed zip files are being unpacked using the PHP zip extension.
+# This may cause invalid reports of corrupted archives. Besides, any UNIX permissions (e.g. executable) defined in the archives will be lost.
+# Installing 'unzip' or '7z' (21.01+) may remediate them.
+    unzip \
+	; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*; \
+  php -m;
 
 # VSCode configs
 RUN mkdir -p /var/www/.vscode-server; \
diff --git a/wp/php7.4/Dockerfile b/wp/php7.4/Dockerfile
index 6b97097..92eb85f 100644
--- a/wp/php7.4/Dockerfile
+++ b/wp/php7.4/Dockerfile
@@ -6,6 +6,17 @@ LABEL org.opencontainers.image.description "Image to run WordPress with PHP 7.4.
 ENV NODE_VERSION 20
 ENV WP_VERSION 6.4
 
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+# Ghostscript is required for rendering PDF previews
+		ghostscript \
+# Required for WP-CLI "wp db" command to run properly that otherwise throws "'mysqlcheck': No such file or directory."
+    default-mysql-client \
+	; \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*;
+
 COPY --from=wp-cli /usr/local/bin/wp /usr/local/bin/
 
 RUN set -eux; \
diff --git a/wp/php8.0/Dockerfile b/wp/php8.0/Dockerfile
index aac35f3..883135f 100644
--- a/wp/php8.0/Dockerfile
+++ b/wp/php8.0/Dockerfile
@@ -6,6 +6,17 @@ LABEL org.opencontainers.image.description "Image to run WordPress with PHP 8.0.
 ENV NODE_VERSION 20
 ENV WP_VERSION 6.4
 
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+# Ghostscript is required for rendering PDF previews
+		ghostscript \
+# Required for WP-CLI "wp db" command to run properly that otherwise throws "'mysqlcheck': No such file or directory."
+    default-mysql-client \
+	; \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*;
+
 COPY --from=wp-cli /usr/local/bin/wp /usr/local/bin/
 
 RUN set -eux; \
diff --git a/wp/php8.1/Dockerfile b/wp/php8.1/Dockerfile
index 3a8293f..9c6e47b 100644
--- a/wp/php8.1/Dockerfile
+++ b/wp/php8.1/Dockerfile
@@ -6,6 +6,17 @@ LABEL org.opencontainers.image.description "Image to run WordPress with PHP 8.1.
 ENV NODE_VERSION 20
 ENV WP_VERSION 6.4
 
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+# Ghostscript is required for rendering PDF previews
+		ghostscript \
+# Required for WP-CLI "wp db" command to run properly that otherwise throws "'mysqlcheck': No such file or directory."
+    default-mysql-client \
+	; \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*;
+
 COPY --from=wp-cli /usr/local/bin/wp /usr/local/bin/
 
 RUN set -eux; \
diff --git a/wp/php8.2/Dockerfile b/wp/php8.2/Dockerfile
index 1eb3492..d632083 100644
--- a/wp/php8.2/Dockerfile
+++ b/wp/php8.2/Dockerfile
@@ -6,6 +6,17 @@ LABEL org.opencontainers.image.description "Image to run WordPress with PHP 8.2.
 ENV NODE_VERSION 20
 ENV WP_VERSION 6.4
 
+# Install additional packages.
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+# Ghostscript is required for rendering PDF previews
+		ghostscript \
+# Required for WP-CLI "wp db" command to run properly that otherwise throws "'mysqlcheck': No such file or directory."
+    default-mysql-client \
+	; \
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*;
+
 COPY --from=wp-cli /usr/local/bin/wp /usr/local/bin/
 
 RUN set -eux; \