diff --git a/.travis.yml b/.travis.yml
index 6a41302..38b5be7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@ language: bash
 services: docker
 
 env:
-  - VARIANT=php7.1/apache
-  - VARIANT=php7.1/fpm
-  - VARIANT=php7.1/fpm-alpine
   - VARIANT=php7.2/apache
   - VARIANT=php7.2/fpm
   - VARIANT=php7.2/fpm-alpine
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 7df5e46..256796c 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -16,7 +16,6 @@ RUN set -ex; \
 		autoconf \
 		bzip2-dev \
 		libjpeg-turbo-dev \
-		libmcrypt-dev \
 		libmemcached-dev \
 		libpng-dev \
 		libzip-dev \
@@ -31,7 +30,6 @@ RUN set -ex; \
 		bz2 \
 		gd \
 		ldap \
-		mcrypt \
 		mysqli \
 		pdo_mysql \
 		pdo_pgsql \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 1d6a097..6a5e030 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -14,7 +14,6 @@ RUN set -ex; \
 		libbz2-dev \
 		libjpeg-dev \
 		libldap2-dev \
-		libmcrypt-dev \
 		libmemcached-dev \
 		libpng-dev \
 		libpq-dev \
@@ -28,7 +27,6 @@ RUN set -ex; \
 		bz2 \
 		gd \
 		ldap \
-		mcrypt \
 		mysqli \
 		pdo_mysql \
 		pdo_pgsql \
diff --git a/php7.1/apache/Dockerfile b/php7.1/apache/Dockerfile
deleted file mode 100644
index d47fb02..0000000
--- a/php7.1/apache/Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-FROM php:7.1-apache
-LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
-
-# Disable remote database security requirements.
-ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1
-
-# Enable Apache Rewrite Module
-RUN a2enmod rewrite
-
-# Install PHP extensions
-RUN set -ex; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libbz2-dev \
-		libjpeg-dev \
-		libldap2-dev \
-		libmcrypt-dev \
-		libmemcached-dev \
-		libpng-dev \
-		libpq-dev \
-	; \
-	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-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 \
-		ldap \
-		mcrypt \
-		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.17; \
-	pecl install memcached-3.1.4; \
-	pecl install redis-4.3.0; \
-	\
-	docker-php-ext-enable \
-		apcu \
-		memcached \
-		redis \
-	; \
-	\
-# 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.9.13
-ENV JOOMLA_SHA512 366101203f24a19464d3c86472dd937bb4c192b2621f1245f8907a3c5565594417baa79a19002eda84ac939b92376501a5300dc35a64c0c06df163d2e460550f
-
-# 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"]
diff --git a/php7.1/apache/docker-entrypoint.sh b/php7.1/apache/docker-entrypoint.sh
deleted file mode 100755
index acd4f0b..0000000
--- a/php7.1/apache/docker-entrypoint.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-        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 -a \( -e libraries/cms/version/version.php -o -e libraries/src/Version.php \) ]; then
-                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
-
-                tar cf - --one-file-system -C /usr/src/joomla . | tar xf -
-
-                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 www-data:www-data .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/php7.1/apache/makedb.php b/php7.1/apache/makedb.php
deleted file mode 100644
index 502135c..0000000
--- a/php7.1/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/php7.1/fpm-alpine/Dockerfile b/php7.1/fpm-alpine/Dockerfile
deleted file mode 100644
index 69801ad..0000000
--- a/php7.1/fpm-alpine/Dockerfile
+++ /dev/null
@@ -1,81 +0,0 @@
-FROM php:7.1-fpm-alpine
-LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
-
-# Disable remote database security requirements.
-ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1
-
-# entrypoint.sh dependencies
-RUN apk add --no-cache \
-	bash
-
-# Install PHP extensions
-RUN set -ex; \
-	\
-	apk add --no-cache --virtual .build-deps \
-		$PHPIZE_DEPS \
-		autoconf \
-		bzip2-dev \
-		libjpeg-turbo-dev \
-		libmcrypt-dev \
-		libmemcached-dev \
-		libpng-dev \
-		openldap-dev \
-		pcre-dev \
-		postgresql-dev \
-	; \
-	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-configure ldap; \
-	docker-php-ext-install -j "$(nproc)" \
-		bz2 \
-		gd \
-		ldap \
-		mcrypt \
-		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.17; \
-	pecl install memcached-3.1.4; \
-	pecl install redis-4.3.0; \
-	\
-	docker-php-ext-enable \
-		apcu \
-		memcached \
-		redis \
-	; \
-	\
-	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 SHA1 signature
-ENV JOOMLA_VERSION 3.9.13
-ENV JOOMLA_SHA512 366101203f24a19464d3c86472dd937bb4c192b2621f1245f8907a3c5565594417baa79a19002eda84ac939b92376501a5300dc35a64c0c06df163d2e460550f
-
-# 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"]
diff --git a/php7.1/fpm-alpine/docker-entrypoint.sh b/php7.1/fpm-alpine/docker-entrypoint.sh
deleted file mode 100755
index acd4f0b..0000000
--- a/php7.1/fpm-alpine/docker-entrypoint.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-        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 -a \( -e libraries/cms/version/version.php -o -e libraries/src/Version.php \) ]; then
-                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
-
-                tar cf - --one-file-system -C /usr/src/joomla . | tar xf -
-
-                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 www-data:www-data .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/php7.1/fpm-alpine/makedb.php b/php7.1/fpm-alpine/makedb.php
deleted file mode 100644
index 502135c..0000000
--- a/php7.1/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/php7.1/fpm/Dockerfile b/php7.1/fpm/Dockerfile
deleted file mode 100644
index 16a6c56..0000000
--- a/php7.1/fpm/Dockerfile
+++ /dev/null
@@ -1,83 +0,0 @@
-FROM php:7.1-fpm
-LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
-
-# Disable remote database security requirements.
-ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1
-
-# Install PHP extensions
-RUN set -ex; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libbz2-dev \
-		libjpeg-dev \
-		libldap2-dev \
-		libmcrypt-dev \
-		libmemcached-dev \
-		libpng-dev \
-		libpq-dev \
-	; \
-	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-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 \
-		ldap \
-		mcrypt \
-		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.17; \
-	pecl install memcached-3.1.4; \
-	pecl install redis-4.3.0; \
-	\
-	docker-php-ext-enable \
-		apcu \
-		memcached \
-		redis \
-	; \
-	\
-# 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.9.13
-ENV JOOMLA_SHA512 366101203f24a19464d3c86472dd937bb4c192b2621f1245f8907a3c5565594417baa79a19002eda84ac939b92376501a5300dc35a64c0c06df163d2e460550f
-
-# 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"]
diff --git a/php7.1/fpm/docker-entrypoint.sh b/php7.1/fpm/docker-entrypoint.sh
deleted file mode 100755
index acd4f0b..0000000
--- a/php7.1/fpm/docker-entrypoint.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-        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 -a \( -e libraries/cms/version/version.php -o -e libraries/src/Version.php \) ]; then
-                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
-
-                tar cf - --one-file-system -C /usr/src/joomla . | tar xf -
-
-                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 www-data:www-data .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/php7.1/fpm/makedb.php b/php7.1/fpm/makedb.php
deleted file mode 100644
index 502135c..0000000
--- a/php7.1/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/update.sh b/update.sh
index 8f1fce1..17ac9a5 100755
--- a/update.sh
+++ b/update.sh
@@ -68,14 +68,7 @@ for phpVersion in "${phpVersions[@]}"; do
 			cp -a "$entrypoint" "$dir/docker-entrypoint.sh"
 			cp -a "makedb.php" "$dir/makedb.php"
 
-			if [ $phpVersionDir = "php7.2" -o $phpVersionDir = "php7.3" ]; then
-				sed \
-					-e '/libmcrypt-dev/d' \
-					-e '/mcrypt/d' \
-					-i $dir/Dockerfile
-			fi
-
-			if [[ "$phpVersion" != 7.3 ]]; then
+			if [ "$phpVersion" = 7.2 ]; then
 				sed -ri \
 					-e '/libzip-dev/d' \
 					"$dir/Dockerfile"