diff --git a/7.0/Dockerfile b/7.0/Dockerfile
index fe3b0c8..c99f7b9 100644
--- a/7.0/Dockerfile
+++ b/7.0/Dockerfile
@@ -1,6 +1,9 @@
 ARG PHP_VERSION
 ARG PROJECT_TYPE
 
+FROM alpine:3.13 AS iconv-build
+RUN apk add --no-cache gnu-libiconv
+
 FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine
 
 # setup general options for environment variables
@@ -77,6 +80,9 @@ RUN set -ex && \
     make \
     imagemagick-dev
 
+# https://github.com/craftcms/docker/issues/16
+COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so
+
 # https://github.com/docker-library/php/issues/1121
 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so
 
diff --git a/7.1/Dockerfile b/7.1/Dockerfile
index fe3b0c8..c99f7b9 100644
--- a/7.1/Dockerfile
+++ b/7.1/Dockerfile
@@ -1,6 +1,9 @@
 ARG PHP_VERSION
 ARG PROJECT_TYPE
 
+FROM alpine:3.13 AS iconv-build
+RUN apk add --no-cache gnu-libiconv
+
 FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine
 
 # setup general options for environment variables
@@ -77,6 +80,9 @@ RUN set -ex && \
     make \
     imagemagick-dev
 
+# https://github.com/craftcms/docker/issues/16
+COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so
+
 # https://github.com/docker-library/php/issues/1121
 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so
 
diff --git a/7.2/Dockerfile b/7.2/Dockerfile
index bb58480..cd2e8b7 100644
--- a/7.2/Dockerfile
+++ b/7.2/Dockerfile
@@ -1,6 +1,9 @@
 ARG PHP_VERSION
 ARG PROJECT_TYPE
 
+FROM alpine:3.13 AS iconv-build
+RUN apk add --no-cache gnu-libiconv
+
 FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine
 
 # setup general options for environment variables
@@ -41,7 +44,6 @@ RUN set -ex && \
     g++ \
     make \
     freetype \
-    # gnu-libiconv=1.15-r3 \
     libzip-dev \
     libpng \
     libjpeg-turbo \
@@ -78,6 +80,9 @@ RUN set -ex && \
     make \
     imagemagick-dev
 
+# https://github.com/craftcms/docker/issues/16
+COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so
+
 # https://github.com/docker-library/php/issues/1121
 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so
 
diff --git a/7.3/Dockerfile b/7.3/Dockerfile
index 4181216..c99f7b9 100644
--- a/7.3/Dockerfile
+++ b/7.3/Dockerfile
@@ -1,6 +1,9 @@
 ARG PHP_VERSION
 ARG PROJECT_TYPE
 
+FROM alpine:3.13 AS iconv-build
+RUN apk add --no-cache gnu-libiconv
+
 FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine
 
 # setup general options for environment variables
@@ -45,7 +48,6 @@ RUN set -ex && \
     libpng \
     libjpeg-turbo \
     freetype-dev \
-    gnu-libiconv=1.15-r3 \
     libpng-dev \
     libjpeg-turbo-dev \
     libxml2-dev \
@@ -78,6 +80,9 @@ RUN set -ex && \
     make \
     imagemagick-dev
 
+# https://github.com/craftcms/docker/issues/16
+COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so
+
 # https://github.com/docker-library/php/issues/1121
 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so
 
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
index aba2e05..efad29f 100644
--- a/7.4/Dockerfile
+++ b/7.4/Dockerfile
@@ -1,6 +1,9 @@
 ARG PHP_VERSION
 ARG PROJECT_TYPE
 
+FROM alpine:3.13 AS iconv-build
+RUN apk add --no-cache gnu-libiconv
+
 FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine
 
 # setup general options for environment variables
@@ -45,7 +48,6 @@ RUN set -ex && \
     libpng \
     libjpeg-turbo \
     freetype-dev \
-    gnu-libiconv=1.15-r3 \
     libpng-dev \
     libjpeg-turbo-dev \
     libxml2-dev \
@@ -78,6 +80,9 @@ RUN set -ex && \
     make \
     imagemagick-dev
 
+# https://github.com/craftcms/docker/issues/16
+COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so
+
 # https://github.com/docker-library/php/issues/1121
 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so
 
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 621f638..79de6f4 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -1,6 +1,9 @@
 ARG PHP_VERSION
 ARG PROJECT_TYPE
 
+FROM alpine:3.13 AS iconv-build
+RUN apk add --no-cache gnu-libiconv
+
 FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine
 
 # setup general options for environment variables
@@ -42,7 +45,7 @@ RUN set -ex && \
     g++ \
     make \
     freetype \
-    gnu-libiconv=1.15-r3 \
+    gnu-libiconv \
     libzip-dev \
     libpng \
     libjpeg-turbo \
@@ -75,6 +78,9 @@ RUN set -ex && \
     g++ \
     make
 
+# https://github.com/craftcms/docker/issues/16
+COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so
+
 # https://github.com/docker-library/php/issues/1121
 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so