diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 9313522..8abf1dc 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -22,6 +22,7 @@ RUN set -x \
 		perl \
 		perl-utils \
 		tar \
+		wget \
 	\
 	&& wget -O memcached.tar.gz "https://memcached.org/files/memcached-$MEMCACHED_VERSION.tar.gz" \
 	&& echo "$MEMCACHED_SHA1  memcached.tar.gz" | sha1sum -c - \
@@ -31,11 +32,22 @@ RUN set -x \
 	\
 	&& cd /usr/src/memcached \
 	\
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& enableExtstore="$( \
+# https://github.com/docker-library/memcached/pull/38
+		case "$gnuArch" in \
+# https://github.com/memcached/memcached/issues/381 "--enable-extstore on s390x (IBM System Z mainframe architecture) fails tests"
+			s390x-*) ;; \
+			*) echo '--enable-extstore' ;; \
+		esac \
+	)" \
 	&& ./configure \
-		--build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+		--build="$gnuArch" \
 		--enable-sasl \
+		$enableExtstore \
 	&& make -j "$(nproc)" \
 	\
+# TODO https://github.com/memcached/memcached/issues/382 "t/chunked-extstore.t is flaky on arm32v6"
 	&& make test \
 	&& make install \
 	\
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 05ca5af..e324685 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -30,11 +30,22 @@ RUN set -x \
 	\
 	&& cd /usr/src/memcached \
 	\
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& enableExtstore="$( \
+# https://github.com/docker-library/memcached/pull/38
+		case "$gnuArch" in \
+# https://github.com/memcached/memcached/issues/381 "--enable-extstore on s390x (IBM System Z mainframe architecture) fails tests"
+			s390x-*) ;; \
+			*) echo '--enable-extstore' ;; \
+		esac \
+	)" \
 	&& ./configure \
-		--build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+		--build="$gnuArch" \
 		--enable-sasl \
+		$enableExtstore \
 	&& make -j "$(nproc)" \
 	\
+# TODO https://github.com/memcached/memcached/issues/382 "t/chunked-extstore.t is flaky on arm32v6"
 	&& make test \
 	&& make install \
 	\