diff --git a/2.1/Dockerfile b/2.1/Dockerfile
index eb5a0409e..16de059e8 100644
--- a/2.1/Dockerfile
+++ b/2.1/Dockerfile
@@ -18,6 +18,7 @@ RUN set -ex \
 	\
 	&& buildDeps=' \
 		bison \
+		dpkg-dev \
 		libgdbm-dev \
 		ruby \
 	' \
@@ -44,8 +45,12 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
-	&& ./configure --disable-install-doc --enable-shared \
-	&& make -j"$(nproc)" \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& apt-get purge -y --auto-remove $buildDeps \
diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile
index 790612721..6d8d835d9 100644
--- a/2.1/alpine/Dockerfile
+++ b/2.1/alpine/Dockerfile
@@ -24,6 +24,7 @@ RUN set -ex \
 		bzip2-dev \
 		ca-certificates \
 		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gdbm-dev \
 		glib-dev \
@@ -63,10 +64,14 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 # the configure script does not detect isnan/isinf as macros
-	&& ac_cv_func_isnan=yes ac_cv_func_isinf=yes \
-		./configure --disable-install-doc --enable-shared \
-	&& make -j"$(getconf _NPROCESSORS_ONLN)" \
+	&& export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& runDeps="$( \
diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile
index b5350e6c6..23dd34ada 100644
--- a/2.1/slim/Dockerfile
+++ b/2.1/slim/Dockerfile
@@ -31,6 +31,7 @@ RUN set -ex \
 	&& buildDeps=' \
 		autoconf \
 		bison \
+		dpkg-dev \
 		gcc \
 		libbz2-dev \
 		libgdbm-dev \
@@ -67,8 +68,12 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
-	&& ./configure --disable-install-doc --enable-shared \
-	&& make -j"$(nproc)" \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& apt-get purge -y --auto-remove $buildDeps \
diff --git a/2.2/Dockerfile b/2.2/Dockerfile
index 03746918d..6ffa3522c 100644
--- a/2.2/Dockerfile
+++ b/2.2/Dockerfile
@@ -18,6 +18,7 @@ RUN set -ex \
 	\
 	&& buildDeps=' \
 		bison \
+		dpkg-dev \
 		libgdbm-dev \
 		ruby \
 	' \
@@ -44,8 +45,12 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
-	&& ./configure --disable-install-doc --enable-shared \
-	&& make -j"$(nproc)" \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& apt-get purge -y --auto-remove $buildDeps \
diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile
index 856431a13..8dce338be 100644
--- a/2.2/alpine/Dockerfile
+++ b/2.2/alpine/Dockerfile
@@ -24,6 +24,7 @@ RUN set -ex \
 		bzip2-dev \
 		ca-certificates \
 		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gdbm-dev \
 		glib-dev \
@@ -63,10 +64,14 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 # the configure script does not detect isnan/isinf as macros
-	&& ac_cv_func_isnan=yes ac_cv_func_isinf=yes \
-		./configure --disable-install-doc --enable-shared \
-	&& make -j"$(getconf _NPROCESSORS_ONLN)" \
+	&& export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& runDeps="$( \
diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile
index b78e33469..369ed4aa9 100644
--- a/2.2/slim/Dockerfile
+++ b/2.2/slim/Dockerfile
@@ -31,6 +31,7 @@ RUN set -ex \
 	&& buildDeps=' \
 		autoconf \
 		bison \
+		dpkg-dev \
 		gcc \
 		libbz2-dev \
 		libgdbm-dev \
@@ -67,8 +68,12 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
-	&& ./configure --disable-install-doc --enable-shared \
-	&& make -j"$(nproc)" \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& apt-get purge -y --auto-remove $buildDeps \
diff --git a/2.3/Dockerfile b/2.3/Dockerfile
index 8ea6ad77e..544e368be 100644
--- a/2.3/Dockerfile
+++ b/2.3/Dockerfile
@@ -18,6 +18,7 @@ RUN set -ex \
 	\
 	&& buildDeps=' \
 		bison \
+		dpkg-dev \
 		libgdbm-dev \
 		ruby \
 	' \
@@ -44,8 +45,12 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
-	&& ./configure --disable-install-doc --enable-shared \
-	&& make -j"$(nproc)" \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& apt-get purge -y --auto-remove $buildDeps \
diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile
index fb447de9a..23a72b9e9 100644
--- a/2.3/alpine/Dockerfile
+++ b/2.3/alpine/Dockerfile
@@ -24,6 +24,7 @@ RUN set -ex \
 		bzip2-dev \
 		ca-certificates \
 		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gdbm-dev \
 		glib-dev \
@@ -63,10 +64,14 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 # the configure script does not detect isnan/isinf as macros
-	&& ac_cv_func_isnan=yes ac_cv_func_isinf=yes \
-		./configure --disable-install-doc --enable-shared \
-	&& make -j"$(getconf _NPROCESSORS_ONLN)" \
+	&& export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& runDeps="$( \
diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile
index 75ac3cd52..c0b57ffb5 100644
--- a/2.3/slim/Dockerfile
+++ b/2.3/slim/Dockerfile
@@ -31,6 +31,7 @@ RUN set -ex \
 	&& buildDeps=' \
 		autoconf \
 		bison \
+		dpkg-dev \
 		gcc \
 		libbz2-dev \
 		libgdbm-dev \
@@ -67,8 +68,12 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
-	&& ./configure --disable-install-doc --enable-shared \
-	&& make -j"$(nproc)" \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& apt-get purge -y --auto-remove $buildDeps \
diff --git a/2.4/Dockerfile b/2.4/Dockerfile
index d7d9d737a..cb90faff0 100644
--- a/2.4/Dockerfile
+++ b/2.4/Dockerfile
@@ -18,6 +18,7 @@ RUN set -ex \
 	\
 	&& buildDeps=' \
 		bison \
+		dpkg-dev \
 		libgdbm-dev \
 		ruby \
 	' \
@@ -44,8 +45,12 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
-	&& ./configure --disable-install-doc --enable-shared \
-	&& make -j"$(nproc)" \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& apt-get purge -y --auto-remove $buildDeps \
diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile
index b23c37e0c..c2c1ee98b 100644
--- a/2.4/alpine/Dockerfile
+++ b/2.4/alpine/Dockerfile
@@ -24,6 +24,7 @@ RUN set -ex \
 		bzip2-dev \
 		ca-certificates \
 		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gdbm-dev \
 		glib-dev \
@@ -63,10 +64,14 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 # the configure script does not detect isnan/isinf as macros
-	&& ac_cv_func_isnan=yes ac_cv_func_isinf=yes \
-		./configure --disable-install-doc --enable-shared \
-	&& make -j"$(getconf _NPROCESSORS_ONLN)" \
+	&& export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& runDeps="$( \
diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile
index 0abf42cbd..f2492256e 100644
--- a/2.4/slim/Dockerfile
+++ b/2.4/slim/Dockerfile
@@ -31,6 +31,7 @@ RUN set -ex \
 	&& buildDeps=' \
 		autoconf \
 		bison \
+		dpkg-dev \
 		gcc \
 		libbz2-dev \
 		libgdbm-dev \
@@ -67,8 +68,12 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
-	&& ./configure --disable-install-doc --enable-shared \
-	&& make -j"$(nproc)" \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& apt-get purge -y --auto-remove $buildDeps \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 8880bad53..cf4ff8e2f 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -24,6 +24,7 @@ RUN set -ex \
 		bzip2-dev \
 		ca-certificates \
 		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gdbm-dev \
 		glib-dev \
@@ -63,10 +64,14 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
 # the configure script does not detect isnan/isinf as macros
-	&& ac_cv_func_isnan=yes ac_cv_func_isinf=yes \
-		./configure --disable-install-doc --enable-shared \
-	&& make -j"$(getconf _NPROCESSORS_ONLN)" \
+	&& export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& runDeps="$( \
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
index d0b68f2a6..5f8d03694 100644
--- a/Dockerfile-slim.template
+++ b/Dockerfile-slim.template
@@ -31,6 +31,7 @@ RUN set -ex \
 	&& buildDeps=' \
 		autoconf \
 		bison \
+		dpkg-dev \
 		gcc \
 		libbz2-dev \
 		libgdbm-dev \
@@ -67,8 +68,12 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
-	&& ./configure --disable-install-doc --enable-shared \
-	&& make -j"$(nproc)" \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& apt-get purge -y --auto-remove $buildDeps \
diff --git a/Dockerfile.template b/Dockerfile.template
index eb61b87b5..c43a4acdb 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -18,6 +18,7 @@ RUN set -ex \
 	\
 	&& buildDeps=' \
 		bison \
+		dpkg-dev \
 		libgdbm-dev \
 		ruby \
 	' \
@@ -44,8 +45,12 @@ RUN set -ex \
 	&& mv file.c.new file.c \
 	\
 	&& autoconf \
-	&& ./configure --disable-install-doc --enable-shared \
-	&& make -j"$(nproc)" \
+	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& ./configure \
+		--build="$gnuArch" \
+		--disable-install-doc \
+		--enable-shared \
+	&& make -j "$(nproc)" \
 	&& make install \
 	\
 	&& apt-get purge -y --auto-remove $buildDeps \