diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 256796c..4421f3f 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -24,7 +24,7 @@ RUN set -ex; \
 		postgresql-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg; \
 	docker-php-ext-configure ldap; \
 	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 6a5e030..9ffde24 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -20,7 +20,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg; \
 	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/php7.2/apache/Dockerfile b/php7.2/apache/Dockerfile
index 1f59c1f..d188835 100644
--- a/php7.2/apache/Dockerfile
+++ b/php7.2/apache/Dockerfile
@@ -22,7 +22,7 @@ RUN set -ex; \
 		libpq-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	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)" \
@@ -38,7 +38,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.2/fpm-alpine/Dockerfile b/php7.2/fpm-alpine/Dockerfile
index a440a03..01d06dc 100644
--- a/php7.2/fpm-alpine/Dockerfile
+++ b/php7.2/fpm-alpine/Dockerfile
@@ -23,7 +23,7 @@ RUN set -ex; \
 		postgresql-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	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 \
@@ -38,7 +38,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.2/fpm/Dockerfile b/php7.2/fpm/Dockerfile
index ff3e9a5..affe41f 100644
--- a/php7.2/fpm/Dockerfile
+++ b/php7.2/fpm/Dockerfile
@@ -19,7 +19,7 @@ RUN set -ex; \
 		libpq-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	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)" \
@@ -35,7 +35,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.3/apache/Dockerfile b/php7.3/apache/Dockerfile
index 34a89d6..ed114ca 100644
--- a/php7.3/apache/Dockerfile
+++ b/php7.3/apache/Dockerfile
@@ -23,7 +23,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	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)" \
@@ -39,7 +39,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.3/fpm-alpine/Dockerfile b/php7.3/fpm-alpine/Dockerfile
index fe1481c..bb246bb 100644
--- a/php7.3/fpm-alpine/Dockerfile
+++ b/php7.3/fpm-alpine/Dockerfile
@@ -24,7 +24,7 @@ RUN set -ex; \
 		postgresql-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	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 \
@@ -39,7 +39,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.3/fpm/Dockerfile b/php7.3/fpm/Dockerfile
index d98b135..3bbea26 100644
--- a/php7.3/fpm/Dockerfile
+++ b/php7.3/fpm/Dockerfile
@@ -20,7 +20,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	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)" \
@@ -36,7 +36,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.4/apache/Dockerfile b/php7.4/apache/Dockerfile
index c60b7bf..af5f90a 100644
--- a/php7.4/apache/Dockerfile
+++ b/php7.4/apache/Dockerfile
@@ -23,7 +23,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install -j "$(nproc)" \
@@ -39,7 +39,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.4/fpm-alpine/Dockerfile b/php7.4/fpm-alpine/Dockerfile
index f928379..50f5a32 100644
--- a/php7.4/fpm-alpine/Dockerfile
+++ b/php7.4/fpm-alpine/Dockerfile
@@ -24,7 +24,7 @@ RUN set -ex; \
 		postgresql-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg; \
 	docker-php-ext-configure ldap; \
 	docker-php-ext-install -j "$(nproc)" \
 		bz2 \
@@ -39,7 +39,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/php7.4/fpm/Dockerfile b/php7.4/fpm/Dockerfile
index e53540a..b1f596a 100644
--- a/php7.4/fpm/Dockerfile
+++ b/php7.4/fpm/Dockerfile
@@ -20,7 +20,7 @@ RUN set -ex; \
 		libzip-dev \
 	; \
 	\
-	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd --with-jpeg; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install -j "$(nproc)" \
@@ -36,7 +36,7 @@ RUN set -ex; \
 	\
 # pecl will claim success even if one install fails, so we need to perform each install separately
 	pecl install APCu-5.1.18; \
-	pecl install memcached-3.1.4; \
+	pecl install memcached-3.1.5; \
 	pecl install redis-4.3.0; \
 	\
 	docker-php-ext-enable \
diff --git a/update.sh b/update.sh
index 972f1c0..acded9d 100755
--- a/update.sh
+++ b/update.sh
@@ -30,7 +30,7 @@ declare -A variantBases=(
 )
 declare -A pecl_versions=(
 	[php7-APCu]='5.1.18'
-	[php7-memcached]='3.1.4'
+	[php7-memcached]='3.1.5'
 	[php7-redis]='4.3.0'
 )
 
@@ -73,6 +73,13 @@ for phpVersion in "${phpVersions[@]}"; do
 					-e '/libzip-dev/d' \
 					"$dir/Dockerfile"
 			fi
+			case "$phpVersion" in
+				7.2 | 7.3 )
+					sed -ri \
+						-e 's!gd --with-jpeg!gd --with-jpeg-dir=/usr --with-png-dir=/usr!g' \
+						"$dir/Dockerfile"
+					;;
+			esac
 
 		)