diff --git a/3.10/php7.3/apache/Dockerfile b/3.10/php7.3/apache/Dockerfile
deleted file mode 100644
index aa51337..0000000
--- a/3.10/php7.3/apache/Dockerfile
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-# from https://downloads.joomla.org/technical-requirements
-FROM php:7.3-apache
-LABEL maintainer="Llewellyn van der Merwe <llewellyn.van-der-merwe@community.joomla.org> (@Llewellynvdm), Harald Leithner <harald.leithner@community.joomla.org> (@HLeithner)"
-
-# Disable remote database security requirements.
-ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1
-# Enable Apache Rewrite Module
-RUN a2enmod rewrite
-# Install the PHP extensions
-RUN set -ex; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libbz2-dev \
-		libgmp-dev \
-		libjpeg-dev \
-		libldap2-dev \
-		libmcrypt-dev \
-		libmemcached-dev \
-		libpng-dev \
-		libpq-dev \
-		libzip-dev \
-	; \
-	\
-	docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
-	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-	docker-php-ext-install -j "$(nproc)" \
-		bz2 \
-		gd \
-		gmp \
-		ldap \
-		mysqli \
-		pdo_mysql \
-		pdo_pgsql \
-		pgsql \
-		zip \
-	; \
-	\
-# pecl will claim success even if one install fails, so we need to perform each install separately
-	pecl install APCu-5.1.21; \
-	pecl install memcached-3.2.0; \
-	pecl install redis-5.3.7; \
-	\
-	docker-php-ext-enable \
-		apcu \
-		memcached \
-		redis \
-	; \
-	rm -r /tmp/pear; \
-	\
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	apt-mark manual $savedAptMark; \
-	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
-		| sort -u \
-		| xargs -r dpkg-query -S \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -rt apt-mark manual; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	rm -rf /var/lib/apt/lists/*
-
-VOLUME /var/www/html
-
-# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 3.10.6
-ENV JOOMLA_SHA512 cd871290f83d6fd1a2e3fe077735e86554a1b3825e5d7e831df7aad56831ee6a958d77e92fa50c0cbbd240ed1158d4c1eadc8c1e968c990db5c89c4f5ee40a0a
-
-# Download package and extract to web volume
-RUN set -ex; \
-	curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2; \
-	echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
-	mkdir /usr/src/joomla; \
-	tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
-	rm joomla.tar.bz2; \
-	chown -R www-data:www-data /usr/src/joomla
-
-# Copy init scripts and custom .htaccess
-COPY docker-entrypoint.sh /entrypoint.sh
-COPY makedb.php /makedb.php
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["apache2-foreground"]
-
-# vim:set ft=dockerfile:
diff --git a/3.10/php7.3/apache/docker-entrypoint.sh b/3.10/php7.3/apache/docker-entrypoint.sh
deleted file mode 100755
index 26346ea..0000000
--- a/3.10/php7.3/apache/docker-entrypoint.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then
-        JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE")
-fi
-
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-        uid="$(id -u)"
-        gid="$(id -g)"
-        if [ "$uid" = '0' ]; then
-                case "$1" in
-                apache2*)
-                        user="${APACHE_RUN_USER:-www-data}"
-                        group="${APACHE_RUN_GROUP:-www-data}"
-
-                        # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                        pound='#'
-                        user="${user#$pound}"
-                        group="${group#$pound}"
-
-                        # set user if not exist
-                        if ! id "$user" &>/dev/null; then
-                                # get the user name
-                                : "${USER_NAME:=www-data}"
-                                # change the user name
-                                [[ "$USER_NAME" != "www-data" ]] &&
-                                        usermod -l "$USER_NAME" www-data &&
-                                        groupmod -n "$USER_NAME" www-data
-                                # update the user ID
-                                groupmod -o -g "$user" "$USER_NAME"
-                                # update the user-group ID
-                                usermod -o -u "$group" "$USER_NAME"
-                        fi
-                        ;;
-                *) # php-fpm
-                        user='www-data'
-                        group='www-data'
-                        ;;
-                esac
-        else
-                user="$uid"
-                group="$gid"
-        fi
-
-        if [ -n "$MYSQL_PORT_3306_TCP" ]; then
-                if [ -z "$JOOMLA_DB_HOST" ]; then
-                        JOOMLA_DB_HOST='mysql'
-                else
-                        echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found"
-                        echo >&2 "  Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)"
-                        echo >&2 "  instead of the linked mysql container"
-                fi
-        fi
-
-        if [ -z "$JOOMLA_DB_HOST" ]; then
-                echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables"
-                echo >&2 "  Did you forget to --link some_mysql_container:mysql or set an external db"
-                echo >&2 "  with -e JOOMLA_DB_HOST=hostname:port?"
-                exit 1
-        fi
-
-        # If the DB user is 'root' then use the MySQL root password env var
-        : "${JOOMLA_DB_USER:=root}"
-        if [ "$JOOMLA_DB_USER" = 'root' ]; then
-                : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
-        fi
-        : "${JOOMLA_DB_NAME:=joomla}"
-
-        if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
-                echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
-                echo >&2 "  Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
-                echo >&2
-                echo >&2 "  (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)"
-                exit 1
-        fi
-
-        if [ ! -e index.php ] && [ ! -e libraries/src/Version.php ]; then
-                # if the directory exists and Joomla doesn't appear to be installed AND the permissions of it are root:root, let's chown it (likely a Docker-created directory)
-                if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' .)" = '0:0' ]; then
-                        chown "$user:$group" .
-                fi
-
-                echo >&2 "Joomla not found in $PWD - copying now..."
-                if [ "$(ls -A)" ]; then
-                        echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"
-                        (
-                                set -x
-                                ls -A
-                                sleep 10
-                        )
-                fi
-                # use full commands
-                # for clearer intent
-                sourceTarArgs=(
-                        --create
-                        --file -
-                        --directory /usr/src/joomla
-                        --one-file-system
-                        --owner "$user" --group "$group"
-                )
-                targetTarArgs=(
-                        --extract
-                        --file -
-                )
-                if [ "$uid" != '0' ]; then
-                        # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted"
-                        targetTarArgs+=(--no-overwrite-dir)
-                fi
-
-                tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}"
-
-                if [ ! -e .htaccess ]; then
-                        # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess
-                        sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt >.htaccess
-                        chown "$user":"$group" .htaccess
-                fi
-
-                echo >&2 "Complete! Joomla has been successfully copied to $PWD"
-        fi
-
-        # Ensure the MySQL Database is created
-        php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME"
-
-        echo >&2 "========================================================================"
-        echo >&2
-        echo >&2 "This server is now configured to run Joomla!"
-        echo >&2
-        echo >&2 "NOTE: You will need your database server address, database name,"
-        echo >&2 "and database user credentials to install Joomla."
-        echo >&2
-        echo >&2 "========================================================================"
-fi
-
-exec "$@"
diff --git a/3.10/php7.3/apache/makedb.php b/3.10/php7.3/apache/makedb.php
deleted file mode 100644
index 502135c..0000000
--- a/3.10/php7.3/apache/makedb.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-// Args: 0 => makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME"
-$stderr = fopen('php://stderr', 'w');
-fwrite($stderr, "\nEnsuring Joomla database is present\n");
-
-if (strpos($argv[1], ':') !== false)
-{
-	list($host, $port) = explode(':', $argv[1], 2);
-}
-else
-{
-	$host = $argv[1];
-	$port = 3306;
-}
-
-$maxTries = 10;
-
-do
-{
-	$mysql = new mysqli($host, $argv[2], $argv[3], '', (int) $port);
-
-	if ($mysql->connect_error)
-	{
-		fwrite($stderr, "\nMySQL Connection Error: ({$mysql->connect_errno}) {$mysql->connect_error}\n");
-		--$maxTries;
-
-		if ($maxTries <= 0)
-		{
-			exit(1);
-		}
-
-		sleep(3);
-	}
-}
-while ($mysql->connect_error);
-
-if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($argv[4]) . '`'))
-{
-	fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n");
-	$mysql->close();
-	exit(1);
-}
-
-fwrite($stderr, "\nMySQL Database Created\n");
-
-$mysql->close();
diff --git a/3.10/php7.3/fpm-alpine/Dockerfile b/3.10/php7.3/fpm-alpine/Dockerfile
deleted file mode 100644
index fb9e9d6..0000000
--- a/3.10/php7.3/fpm-alpine/Dockerfile
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-# from https://downloads.joomla.org/technical-requirements
-FROM php:7.3-fpm-alpine
-LABEL maintainer="Llewellyn van der Merwe <llewellyn.van-der-merwe@community.joomla.org> (@Llewellynvdm), Harald Leithner <harald.leithner@community.joomla.org> (@HLeithner)"
-
-# Disable remote database security requirements.
-ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1
-# entrypoint.sh dependencies
-RUN apk add --no-cache \
-	bash
-# Install the PHP extensions
-RUN set -ex; \
-	\
-	apk add --no-cache --virtual .build-deps \
-		$PHPIZE_DEPS \
-		autoconf \
-		bzip2-dev \
-		gmp-dev \
-		libjpeg-turbo-dev \
-		libmcrypt-dev \
-		libmemcached-dev \
-		libpng-dev \
-		libzip-dev \
-		openldap-dev \
-		pcre-dev \
-		postgresql-dev \
-	; \
-	\
-	docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
-	docker-php-ext-configure ldap; \
-	docker-php-ext-install -j "$(nproc)" \
-		bz2 \
-		gd \
-		gmp \
-		ldap \
-		mysqli \
-		pdo_mysql \
-		pdo_pgsql \
-		pgsql \
-		zip \
-	; \
-	\
-# pecl will claim success even if one install fails, so we need to perform each install separately
-	pecl install APCu-5.1.21; \
-	pecl install mcrypt-1.0.4; \
-	pecl install memcached-3.2.0; \
-	pecl install redis-5.3.7; \
-	\
-	docker-php-ext-enable \
-		apcu \
-		mcrypt \
-		memcached \
-		redis \
-	; \
-	rm -r /tmp/pear; \
-	\
-	runDeps="$( \
-		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
-		| tr ',' '\n' \
-		| sort -u \
-		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		)"; \
-	apk add --virtual .joomla-phpext-rundeps $runDeps; \
-	apk del .build-deps
-
-VOLUME /var/www/html
-
-# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 3.10.6
-ENV JOOMLA_SHA512 cd871290f83d6fd1a2e3fe077735e86554a1b3825e5d7e831df7aad56831ee6a958d77e92fa50c0cbbd240ed1158d4c1eadc8c1e968c990db5c89c4f5ee40a0a
-
-# Download package and extract to web volume
-RUN set -ex; \
-	curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2; \
-	echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
-	mkdir /usr/src/joomla; \
-	tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
-	rm joomla.tar.bz2; \
-	chown -R www-data:www-data /usr/src/joomla
-
-# Copy init scripts and custom .htaccess
-COPY docker-entrypoint.sh /entrypoint.sh
-COPY makedb.php /makedb.php
-
-ENTRYPOINT ["/entrypoint.sh"]
-
-CMD ["php-fpm"]
-
-# vim:set ft=dockerfile:
diff --git a/3.10/php7.3/fpm-alpine/docker-entrypoint.sh b/3.10/php7.3/fpm-alpine/docker-entrypoint.sh
deleted file mode 100755
index 26346ea..0000000
--- a/3.10/php7.3/fpm-alpine/docker-entrypoint.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then
-        JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE")
-fi
-
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-        uid="$(id -u)"
-        gid="$(id -g)"
-        if [ "$uid" = '0' ]; then
-                case "$1" in
-                apache2*)
-                        user="${APACHE_RUN_USER:-www-data}"
-                        group="${APACHE_RUN_GROUP:-www-data}"
-
-                        # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                        pound='#'
-                        user="${user#$pound}"
-                        group="${group#$pound}"
-
-                        # set user if not exist
-                        if ! id "$user" &>/dev/null; then
-                                # get the user name
-                                : "${USER_NAME:=www-data}"
-                                # change the user name
-                                [[ "$USER_NAME" != "www-data" ]] &&
-                                        usermod -l "$USER_NAME" www-data &&
-                                        groupmod -n "$USER_NAME" www-data
-                                # update the user ID
-                                groupmod -o -g "$user" "$USER_NAME"
-                                # update the user-group ID
-                                usermod -o -u "$group" "$USER_NAME"
-                        fi
-                        ;;
-                *) # php-fpm
-                        user='www-data'
-                        group='www-data'
-                        ;;
-                esac
-        else
-                user="$uid"
-                group="$gid"
-        fi
-
-        if [ -n "$MYSQL_PORT_3306_TCP" ]; then
-                if [ -z "$JOOMLA_DB_HOST" ]; then
-                        JOOMLA_DB_HOST='mysql'
-                else
-                        echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found"
-                        echo >&2 "  Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)"
-                        echo >&2 "  instead of the linked mysql container"
-                fi
-        fi
-
-        if [ -z "$JOOMLA_DB_HOST" ]; then
-                echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables"
-                echo >&2 "  Did you forget to --link some_mysql_container:mysql or set an external db"
-                echo >&2 "  with -e JOOMLA_DB_HOST=hostname:port?"
-                exit 1
-        fi
-
-        # If the DB user is 'root' then use the MySQL root password env var
-        : "${JOOMLA_DB_USER:=root}"
-        if [ "$JOOMLA_DB_USER" = 'root' ]; then
-                : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
-        fi
-        : "${JOOMLA_DB_NAME:=joomla}"
-
-        if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
-                echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
-                echo >&2 "  Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
-                echo >&2
-                echo >&2 "  (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)"
-                exit 1
-        fi
-
-        if [ ! -e index.php ] && [ ! -e libraries/src/Version.php ]; then
-                # if the directory exists and Joomla doesn't appear to be installed AND the permissions of it are root:root, let's chown it (likely a Docker-created directory)
-                if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' .)" = '0:0' ]; then
-                        chown "$user:$group" .
-                fi
-
-                echo >&2 "Joomla not found in $PWD - copying now..."
-                if [ "$(ls -A)" ]; then
-                        echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"
-                        (
-                                set -x
-                                ls -A
-                                sleep 10
-                        )
-                fi
-                # use full commands
-                # for clearer intent
-                sourceTarArgs=(
-                        --create
-                        --file -
-                        --directory /usr/src/joomla
-                        --one-file-system
-                        --owner "$user" --group "$group"
-                )
-                targetTarArgs=(
-                        --extract
-                        --file -
-                )
-                if [ "$uid" != '0' ]; then
-                        # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted"
-                        targetTarArgs+=(--no-overwrite-dir)
-                fi
-
-                tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}"
-
-                if [ ! -e .htaccess ]; then
-                        # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess
-                        sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt >.htaccess
-                        chown "$user":"$group" .htaccess
-                fi
-
-                echo >&2 "Complete! Joomla has been successfully copied to $PWD"
-        fi
-
-        # Ensure the MySQL Database is created
-        php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME"
-
-        echo >&2 "========================================================================"
-        echo >&2
-        echo >&2 "This server is now configured to run Joomla!"
-        echo >&2
-        echo >&2 "NOTE: You will need your database server address, database name,"
-        echo >&2 "and database user credentials to install Joomla."
-        echo >&2
-        echo >&2 "========================================================================"
-fi
-
-exec "$@"
diff --git a/3.10/php7.3/fpm-alpine/makedb.php b/3.10/php7.3/fpm-alpine/makedb.php
deleted file mode 100644
index 502135c..0000000
--- a/3.10/php7.3/fpm-alpine/makedb.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-// Args: 0 => makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME"
-$stderr = fopen('php://stderr', 'w');
-fwrite($stderr, "\nEnsuring Joomla database is present\n");
-
-if (strpos($argv[1], ':') !== false)
-{
-	list($host, $port) = explode(':', $argv[1], 2);
-}
-else
-{
-	$host = $argv[1];
-	$port = 3306;
-}
-
-$maxTries = 10;
-
-do
-{
-	$mysql = new mysqli($host, $argv[2], $argv[3], '', (int) $port);
-
-	if ($mysql->connect_error)
-	{
-		fwrite($stderr, "\nMySQL Connection Error: ({$mysql->connect_errno}) {$mysql->connect_error}\n");
-		--$maxTries;
-
-		if ($maxTries <= 0)
-		{
-			exit(1);
-		}
-
-		sleep(3);
-	}
-}
-while ($mysql->connect_error);
-
-if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($argv[4]) . '`'))
-{
-	fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n");
-	$mysql->close();
-	exit(1);
-}
-
-fwrite($stderr, "\nMySQL Database Created\n");
-
-$mysql->close();
diff --git a/3.10/php7.3/fpm/Dockerfile b/3.10/php7.3/fpm/Dockerfile
deleted file mode 100644
index 38b32d9..0000000
--- a/3.10/php7.3/fpm/Dockerfile
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-# from https://downloads.joomla.org/technical-requirements
-FROM php:7.3-fpm
-LABEL maintainer="Llewellyn van der Merwe <llewellyn.van-der-merwe@community.joomla.org> (@Llewellynvdm), Harald Leithner <harald.leithner@community.joomla.org> (@HLeithner)"
-
-# Disable remote database security requirements.
-ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1
-# Install the PHP extensions
-RUN set -ex; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libbz2-dev \
-		libgmp-dev \
-		libjpeg-dev \
-		libldap2-dev \
-		libmcrypt-dev \
-		libmemcached-dev \
-		libpng-dev \
-		libpq-dev \
-		libzip-dev \
-	; \
-	\
-	docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
-	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
-	docker-php-ext-install -j "$(nproc)" \
-		bz2 \
-		gd \
-		gmp \
-		ldap \
-		mysqli \
-		pdo_mysql \
-		pdo_pgsql \
-		pgsql \
-		zip \
-	; \
-	\
-# pecl will claim success even if one install fails, so we need to perform each install separately
-	pecl install APCu-5.1.21; \
-	pecl install memcached-3.2.0; \
-	pecl install redis-5.3.7; \
-	\
-	docker-php-ext-enable \
-		apcu \
-		memcached \
-		redis \
-	; \
-	rm -r /tmp/pear; \
-	\
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	apt-mark manual $savedAptMark; \
-	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
-		| sort -u \
-		| xargs -r dpkg-query -S \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -rt apt-mark manual; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	rm -rf /var/lib/apt/lists/*
-
-VOLUME /var/www/html
-
-# Define Joomla version and expected SHA512 signature
-ENV JOOMLA_VERSION 3.10.6
-ENV JOOMLA_SHA512 cd871290f83d6fd1a2e3fe077735e86554a1b3825e5d7e831df7aad56831ee6a958d77e92fa50c0cbbd240ed1158d4c1eadc8c1e968c990db5c89c4f5ee40a0a
-
-# Download package and extract to web volume
-RUN set -ex; \
-	curl -o joomla.tar.bz2 -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.tar.bz2; \
-	echo "$JOOMLA_SHA512 *joomla.tar.bz2" | sha512sum -c -; \
-	mkdir /usr/src/joomla; \
-	tar -xf joomla.tar.bz2 -C /usr/src/joomla; \
-	rm joomla.tar.bz2; \
-	chown -R www-data:www-data /usr/src/joomla
-
-# Copy init scripts and custom .htaccess
-COPY docker-entrypoint.sh /entrypoint.sh
-COPY makedb.php /makedb.php
-
-ENTRYPOINT ["/entrypoint.sh"]
-
-CMD ["php-fpm"]
-
-# vim:set ft=dockerfile:
diff --git a/3.10/php7.3/fpm/docker-entrypoint.sh b/3.10/php7.3/fpm/docker-entrypoint.sh
deleted file mode 100755
index 26346ea..0000000
--- a/3.10/php7.3/fpm/docker-entrypoint.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then
-        JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE")
-fi
-
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-        uid="$(id -u)"
-        gid="$(id -g)"
-        if [ "$uid" = '0' ]; then
-                case "$1" in
-                apache2*)
-                        user="${APACHE_RUN_USER:-www-data}"
-                        group="${APACHE_RUN_GROUP:-www-data}"
-
-                        # strip off any '#' symbol ('#1000' is valid syntax for Apache)
-                        pound='#'
-                        user="${user#$pound}"
-                        group="${group#$pound}"
-
-                        # set user if not exist
-                        if ! id "$user" &>/dev/null; then
-                                # get the user name
-                                : "${USER_NAME:=www-data}"
-                                # change the user name
-                                [[ "$USER_NAME" != "www-data" ]] &&
-                                        usermod -l "$USER_NAME" www-data &&
-                                        groupmod -n "$USER_NAME" www-data
-                                # update the user ID
-                                groupmod -o -g "$user" "$USER_NAME"
-                                # update the user-group ID
-                                usermod -o -u "$group" "$USER_NAME"
-                        fi
-                        ;;
-                *) # php-fpm
-                        user='www-data'
-                        group='www-data'
-                        ;;
-                esac
-        else
-                user="$uid"
-                group="$gid"
-        fi
-
-        if [ -n "$MYSQL_PORT_3306_TCP" ]; then
-                if [ -z "$JOOMLA_DB_HOST" ]; then
-                        JOOMLA_DB_HOST='mysql'
-                else
-                        echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found"
-                        echo >&2 "  Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)"
-                        echo >&2 "  instead of the linked mysql container"
-                fi
-        fi
-
-        if [ -z "$JOOMLA_DB_HOST" ]; then
-                echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables"
-                echo >&2 "  Did you forget to --link some_mysql_container:mysql or set an external db"
-                echo >&2 "  with -e JOOMLA_DB_HOST=hostname:port?"
-                exit 1
-        fi
-
-        # If the DB user is 'root' then use the MySQL root password env var
-        : "${JOOMLA_DB_USER:=root}"
-        if [ "$JOOMLA_DB_USER" = 'root' ]; then
-                : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD}
-        fi
-        : "${JOOMLA_DB_NAME:=joomla}"
-
-        if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
-                echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
-                echo >&2 "  Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
-                echo >&2
-                echo >&2 "  (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)"
-                exit 1
-        fi
-
-        if [ ! -e index.php ] && [ ! -e libraries/src/Version.php ]; then
-                # if the directory exists and Joomla doesn't appear to be installed AND the permissions of it are root:root, let's chown it (likely a Docker-created directory)
-                if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' .)" = '0:0' ]; then
-                        chown "$user:$group" .
-                fi
-
-                echo >&2 "Joomla not found in $PWD - copying now..."
-                if [ "$(ls -A)" ]; then
-                        echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"
-                        (
-                                set -x
-                                ls -A
-                                sleep 10
-                        )
-                fi
-                # use full commands
-                # for clearer intent
-                sourceTarArgs=(
-                        --create
-                        --file -
-                        --directory /usr/src/joomla
-                        --one-file-system
-                        --owner "$user" --group "$group"
-                )
-                targetTarArgs=(
-                        --extract
-                        --file -
-                )
-                if [ "$uid" != '0' ]; then
-                        # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted"
-                        targetTarArgs+=(--no-overwrite-dir)
-                fi
-
-                tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}"
-
-                if [ ! -e .htaccess ]; then
-                        # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess
-                        sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt >.htaccess
-                        chown "$user":"$group" .htaccess
-                fi
-
-                echo >&2 "Complete! Joomla has been successfully copied to $PWD"
-        fi
-
-        # Ensure the MySQL Database is created
-        php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME"
-
-        echo >&2 "========================================================================"
-        echo >&2
-        echo >&2 "This server is now configured to run Joomla!"
-        echo >&2
-        echo >&2 "NOTE: You will need your database server address, database name,"
-        echo >&2 "and database user credentials to install Joomla."
-        echo >&2
-        echo >&2 "========================================================================"
-fi
-
-exec "$@"
diff --git a/3.10/php7.3/fpm/makedb.php b/3.10/php7.3/fpm/makedb.php
deleted file mode 100644
index 502135c..0000000
--- a/3.10/php7.3/fpm/makedb.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-// Args: 0 => makedb.php, 1 => "$JOOMLA_DB_HOST", 2 => "$JOOMLA_DB_USER", 3 => "$JOOMLA_DB_PASSWORD", 4 => "$JOOMLA_DB_NAME"
-$stderr = fopen('php://stderr', 'w');
-fwrite($stderr, "\nEnsuring Joomla database is present\n");
-
-if (strpos($argv[1], ':') !== false)
-{
-	list($host, $port) = explode(':', $argv[1], 2);
-}
-else
-{
-	$host = $argv[1];
-	$port = 3306;
-}
-
-$maxTries = 10;
-
-do
-{
-	$mysql = new mysqli($host, $argv[2], $argv[3], '', (int) $port);
-
-	if ($mysql->connect_error)
-	{
-		fwrite($stderr, "\nMySQL Connection Error: ({$mysql->connect_errno}) {$mysql->connect_error}\n");
-		--$maxTries;
-
-		if ($maxTries <= 0)
-		{
-			exit(1);
-		}
-
-		sleep(3);
-	}
-}
-while ($mysql->connect_error);
-
-if (!$mysql->query('CREATE DATABASE IF NOT EXISTS `' . $mysql->real_escape_string($argv[4]) . '`'))
-{
-	fwrite($stderr, "\nMySQL 'CREATE DATABASE' Error: " . $mysql->error . "\n");
-	$mysql->close();
-	exit(1);
-}
-
-fwrite($stderr, "\nMySQL Database Created\n");
-
-$mysql->close();
diff --git a/Dockerfile.template b/Dockerfile.template
index 13ccac8..7895b42 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -41,11 +41,7 @@ RUN set -ex; \
 		postgresql-dev \
 	; \
 	\
-{{ if env.phpVersion == "7.3" then ( -}}
-	docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
-{{ ) else ( -}}
 	docker-php-ext-configure gd --with-jpeg; \
-{{ ) end -}}
 	docker-php-ext-configure ldap; \
 	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
@@ -110,11 +106,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-{{ if env.phpVersion == "7.3" then ( -}}
-	docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
-{{ ) else ( -}}
 	docker-php-ext-configure gd --with-jpeg; \
-{{ ) end -}}
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install -j "$(nproc)" \
diff --git a/versions-helper.json b/versions-helper.json
index 92cc848..d7b0b8d 100644
--- a/versions-helper.json
+++ b/versions-helper.json
@@ -45,14 +45,6 @@
           "redis": "5.3.7",
           "mcrypt": "1.0.4"
         }
-      },
-      "7.3": {
-        "pecl": {
-          "APCu": "5.1.21",
-          "memcached": "3.2.0",
-          "redis": "5.3.7",
-          "mcrypt": "1.0.4"
-        }
       }
     },
     "variant": "apache",
diff --git a/versions.json b/versions.json
index eb46a14..3780026 100644
--- a/versions.json
+++ b/versions.json
@@ -5,7 +5,6 @@
     ],
     "php": "7.4",
     "phpVersions": [
-      "7.3",
       "7.4"
     ],
     "sha512": "cd871290f83d6fd1a2e3fe077735e86554a1b3825e5d7e831df7aad56831ee6a958d77e92fa50c0cbbd240ed1158d4c1eadc8c1e968c990db5c89c4f5ee40a0a",