diff --git a/2019.09/apache/Dockerfile b/2019.09/apache/Dockerfile
index e640e51..1690d8b 100644
--- a/2019.09/apache/Dockerfile
+++ b/2019.09/apache/Dockerfile
@@ -36,6 +36,9 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
     ; \
+    \
+        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    \
     docker-php-ext-configure gd \
         --with-gd \
         --with-freetype-dir=/usr/include/ \
@@ -43,8 +46,8 @@ RUN set -ex; \
         --with-jpeg-dir=/usr/include/ \
     ; \
     docker-php-ext-configure ldap \
-    	--with-libdir=lib/x86_64-linux-gnu/ \
-    ; \
+        	--with-libdir=lib/$debMultiarch/ \
+	; \
     docker-php-ext-install -j "$(nproc)" \
         pdo_mysql \
         gd \
diff --git a/2019.09/fpm-alpine/Dockerfile b/2019.09/fpm-alpine/Dockerfile
index a5621d5..b8360ee 100644
--- a/2019.09/fpm-alpine/Dockerfile
+++ b/2019.09/fpm-alpine/Dockerfile
@@ -28,7 +28,8 @@ RUN set -ex; \
         librsvg \
         pcre-dev \
         libzip-dev \
-        libldap2-dev \
+        icu-dev \
+        openldap-dev \
     ; \
     \
     docker-php-ext-configure gd \
@@ -38,9 +39,6 @@ RUN set -ex; \
         --with-jpeg-dir=/usr/include/ \
     ; \
     \
-    docker-php-ext-configure ldap \
-        	--with-libdir=lib/x86_64-linux-gnu/ \
-	; \
     docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
        gd \
diff --git a/2019.09/fpm/Dockerfile b/2019.09/fpm/Dockerfile
index 217f6ec..69ad7a8 100644
--- a/2019.09/fpm/Dockerfile
+++ b/2019.09/fpm/Dockerfile
@@ -36,6 +36,9 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
     ; \
+    \
+        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    \
     docker-php-ext-configure gd \
         --with-gd \
         --with-freetype-dir=/usr/include/ \
@@ -43,8 +46,8 @@ RUN set -ex; \
         --with-jpeg-dir=/usr/include/ \
     ; \
     docker-php-ext-configure ldap \
-    	--with-libdir=lib/x86_64-linux-gnu/ \
-    ; \
+        	--with-libdir=lib/$debMultiarch/ \
+	; \
     docker-php-ext-install -j "$(nproc)" \
         pdo_mysql \
         gd \
diff --git a/2019.12-dev/apache/Dockerfile b/2019.12-dev/apache/Dockerfile
index 21c59a9..f69a817 100644
--- a/2019.12-dev/apache/Dockerfile
+++ b/2019.12-dev/apache/Dockerfile
@@ -36,6 +36,9 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
     ; \
+    \
+        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    \
     docker-php-ext-configure gd \
         --with-gd \
         --with-freetype-dir=/usr/include/ \
@@ -43,8 +46,8 @@ RUN set -ex; \
         --with-jpeg-dir=/usr/include/ \
     ; \
     docker-php-ext-configure ldap \
-    	--with-libdir=lib/x86_64-linux-gnu/ \
-    ; \
+        	--with-libdir=lib/$debMultiarch/ \
+	; \
     docker-php-ext-install -j "$(nproc)" \
         pdo_mysql \
         gd \
diff --git a/2019.12-dev/fpm-alpine/Dockerfile b/2019.12-dev/fpm-alpine/Dockerfile
index 878b30e..ec35d99 100644
--- a/2019.12-dev/fpm-alpine/Dockerfile
+++ b/2019.12-dev/fpm-alpine/Dockerfile
@@ -28,7 +28,8 @@ RUN set -ex; \
         librsvg \
         pcre-dev \
         libzip-dev \
-        libldap2-dev \
+        icu-dev \
+        openldap-dev \
     ; \
     \
     docker-php-ext-configure gd \
@@ -38,9 +39,6 @@ RUN set -ex; \
         --with-jpeg-dir=/usr/include/ \
     ; \
     \
-    docker-php-ext-configure ldap \
-        	--with-libdir=lib/x86_64-linux-gnu/ \
-	; \
     docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
        gd \
diff --git a/2019.12-dev/fpm/Dockerfile b/2019.12-dev/fpm/Dockerfile
index 6c4240b..32a5df3 100644
--- a/2019.12-dev/fpm/Dockerfile
+++ b/2019.12-dev/fpm/Dockerfile
@@ -36,6 +36,9 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
     ; \
+    \
+        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    \
     docker-php-ext-configure gd \
         --with-gd \
         --with-freetype-dir=/usr/include/ \
@@ -43,8 +46,8 @@ RUN set -ex; \
         --with-jpeg-dir=/usr/include/ \
     ; \
     docker-php-ext-configure ldap \
-    	--with-libdir=lib/x86_64-linux-gnu/ \
-    ; \
+        	--with-libdir=lib/$debMultiarch/ \
+	; \
     docker-php-ext-install -j "$(nproc)" \
         pdo_mysql \
         gd \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 400900b..2c9b9db 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -27,7 +27,8 @@ RUN set -ex; \
         librsvg \
         pcre-dev \
         libzip-dev \
-        libldap2-dev \
+        icu-dev \
+        openldap-dev \
     ; \
     \
     docker-php-ext-configure gd \
@@ -37,9 +38,6 @@ RUN set -ex; \
         --with-jpeg-dir=/usr/include/ \
     ; \
     \
-    docker-php-ext-configure ldap \
-        	--with-libdir=lib/x86_64-linux-gnu/ \
-	; \
     docker-php-ext-install -j "$(nproc)" \
        pdo_mysql \
        gd \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 9271dc0..d866128 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -35,6 +35,9 @@ RUN set -ex; \
         libzip-dev \
         libldap2-dev \
     ; \
+    \
+        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    \
     docker-php-ext-configure gd \
         --with-gd \
         --with-freetype-dir=/usr/include/ \
@@ -42,8 +45,8 @@ RUN set -ex; \
         --with-jpeg-dir=/usr/include/ \
     ; \
     docker-php-ext-configure ldap \
-    	--with-libdir=lib/x86_64-linux-gnu/ \
-    ; \
+        	--with-libdir=lib/$debMultiarch/ \
+	; \
     docker-php-ext-install -j "$(nproc)" \
         pdo_mysql \
         gd \