diff --git a/3.0/Dockerfile b/3.0/Dockerfile
index 451c912..2a89ec2 100644
--- a/3.0/Dockerfile
+++ b/3.0/Dockerfile
@@ -15,6 +15,8 @@ RUN set -ex; \
 	apk add --no-cache --virtual .build-deps \
 		bison \
 		ca-certificates \
+		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gnupg \
 		libc-dev \
@@ -78,7 +80,13 @@ RUN set -ex; \
 	fi; \
 	\
 	cd /usr/src/bash; \
+	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
+	for f in config.guess config.sub; do \
+		wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
+	done; \
 	./configure \
+		--build="$gnuArch" \
 		--enable-readline \
 		--with-curses \
 # musl does not implement brk/sbrk (they simply return -ENOMEM)
@@ -90,7 +98,7 @@ RUN set -ex; \
 	}; \
 # parallel jobs workaround borrowed from Alpine :)
 	make y.tab.c; make builtins/libbuiltins.a; \
-	make -j "$(getconf _NPROCESSORS_ONLN)"; \
+	make -j "$(nproc)"; \
 	make install; \
 	cd /; \
 	rm -r /usr/src/bash; \
diff --git a/3.1/Dockerfile b/3.1/Dockerfile
index 6e96155..3cfc285 100644
--- a/3.1/Dockerfile
+++ b/3.1/Dockerfile
@@ -15,6 +15,8 @@ RUN set -ex; \
 	apk add --no-cache --virtual .build-deps \
 		bison \
 		ca-certificates \
+		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gnupg \
 		libc-dev \
@@ -78,7 +80,13 @@ RUN set -ex; \
 	fi; \
 	\
 	cd /usr/src/bash; \
+	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
+	for f in config.guess config.sub; do \
+		wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
+	done; \
 	./configure \
+		--build="$gnuArch" \
 		--enable-readline \
 		--with-curses \
 # musl does not implement brk/sbrk (they simply return -ENOMEM)
@@ -90,7 +98,7 @@ RUN set -ex; \
 	}; \
 # parallel jobs workaround borrowed from Alpine :)
 	make y.tab.c; make builtins/libbuiltins.a; \
-	make -j "$(getconf _NPROCESSORS_ONLN)"; \
+	make -j "$(nproc)"; \
 	make install; \
 	cd /; \
 	rm -r /usr/src/bash; \
diff --git a/3.2/Dockerfile b/3.2/Dockerfile
index 94da9a6..1bdcceb 100644
--- a/3.2/Dockerfile
+++ b/3.2/Dockerfile
@@ -15,6 +15,8 @@ RUN set -ex; \
 	apk add --no-cache --virtual .build-deps \
 		bison \
 		ca-certificates \
+		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gnupg \
 		libc-dev \
@@ -78,7 +80,13 @@ RUN set -ex; \
 	fi; \
 	\
 	cd /usr/src/bash; \
+	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
+	for f in config.guess config.sub; do \
+		wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
+	done; \
 	./configure \
+		--build="$gnuArch" \
 		--enable-readline \
 		--with-curses \
 # musl does not implement brk/sbrk (they simply return -ENOMEM)
@@ -90,7 +98,7 @@ RUN set -ex; \
 	}; \
 # parallel jobs workaround borrowed from Alpine :)
 	make y.tab.c; make builtins/libbuiltins.a; \
-	make -j "$(getconf _NPROCESSORS_ONLN)"; \
+	make -j "$(nproc)"; \
 	make install; \
 	cd /; \
 	rm -r /usr/src/bash; \
diff --git a/4.0/Dockerfile b/4.0/Dockerfile
index 04b2dc1..4ebad2d 100644
--- a/4.0/Dockerfile
+++ b/4.0/Dockerfile
@@ -16,6 +16,8 @@ RUN set -ex; \
 		autoconf \
 		bison \
 		ca-certificates \
+		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gnupg \
 		libc-dev \
@@ -79,7 +81,13 @@ RUN set -ex; \
 	fi; \
 	\
 	cd /usr/src/bash; \
+	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
+	for f in config.guess config.sub; do \
+		wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
+	done; \
 	./configure \
+		--build="$gnuArch" \
 		--enable-readline \
 		--with-curses \
 # musl does not implement brk/sbrk (they simply return -ENOMEM)
@@ -89,9 +97,7 @@ RUN set -ex; \
 		cat >&2 config.log; \
 		false; \
 	}; \
-# parallel jobs workaround borrowed from Alpine :)
-	make y.tab.c; make builtins/libbuiltins.a; \
-	make -j "$(getconf _NPROCESSORS_ONLN)"; \
+	make -j "$(nproc)"; \
 	make install; \
 	cd /; \
 	rm -r /usr/src/bash; \
diff --git a/4.1/Dockerfile b/4.1/Dockerfile
index 450f039..53341c1 100644
--- a/4.1/Dockerfile
+++ b/4.1/Dockerfile
@@ -15,6 +15,8 @@ RUN set -ex; \
 	apk add --no-cache --virtual .build-deps \
 		bison \
 		ca-certificates \
+		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gnupg \
 		libc-dev \
@@ -78,7 +80,13 @@ RUN set -ex; \
 	fi; \
 	\
 	cd /usr/src/bash; \
+	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
+	for f in config.guess config.sub; do \
+		wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
+	done; \
 	./configure \
+		--build="$gnuArch" \
 		--enable-readline \
 		--with-curses \
 # musl does not implement brk/sbrk (they simply return -ENOMEM)
@@ -88,7 +96,7 @@ RUN set -ex; \
 		cat >&2 config.log; \
 		false; \
 	}; \
-	make -j "$(getconf _NPROCESSORS_ONLN)"; \
+	make -j "$(nproc)"; \
 	make install; \
 	cd /; \
 	rm -r /usr/src/bash; \
diff --git a/4.2/Dockerfile b/4.2/Dockerfile
index 6a6ed50..2409e7d 100644
--- a/4.2/Dockerfile
+++ b/4.2/Dockerfile
@@ -15,6 +15,8 @@ RUN set -ex; \
 	apk add --no-cache --virtual .build-deps \
 		bison \
 		ca-certificates \
+		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gnupg \
 		libc-dev \
@@ -78,7 +80,13 @@ RUN set -ex; \
 	fi; \
 	\
 	cd /usr/src/bash; \
+	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
+	for f in config.guess config.sub; do \
+		wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
+	done; \
 	./configure \
+		--build="$gnuArch" \
 		--enable-readline \
 		--with-curses \
 # musl does not implement brk/sbrk (they simply return -ENOMEM)
@@ -88,7 +96,7 @@ RUN set -ex; \
 		cat >&2 config.log; \
 		false; \
 	}; \
-	make -j "$(getconf _NPROCESSORS_ONLN)"; \
+	make -j "$(nproc)"; \
 	make install; \
 	cd /; \
 	rm -r /usr/src/bash; \
diff --git a/4.3/Dockerfile b/4.3/Dockerfile
index d9796d2..ba3ac96 100644
--- a/4.3/Dockerfile
+++ b/4.3/Dockerfile
@@ -15,6 +15,8 @@ RUN set -ex; \
 	apk add --no-cache --virtual .build-deps \
 		bison \
 		ca-certificates \
+		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gnupg \
 		libc-dev \
@@ -78,7 +80,13 @@ RUN set -ex; \
 	fi; \
 	\
 	cd /usr/src/bash; \
+	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
+	for f in config.guess config.sub; do \
+		wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
+	done; \
 	./configure \
+		--build="$gnuArch" \
 		--enable-readline \
 		--with-curses \
 # musl does not implement brk/sbrk (they simply return -ENOMEM)
@@ -88,7 +96,7 @@ RUN set -ex; \
 		cat >&2 config.log; \
 		false; \
 	}; \
-	make -j "$(getconf _NPROCESSORS_ONLN)"; \
+	make -j "$(nproc)"; \
 	make install; \
 	cd /; \
 	rm -r /usr/src/bash; \
diff --git a/4.4/Dockerfile b/4.4/Dockerfile
index 6174f3d..232110d 100644
--- a/4.4/Dockerfile
+++ b/4.4/Dockerfile
@@ -15,6 +15,8 @@ RUN set -ex; \
 	apk add --no-cache --virtual .build-deps \
 		bison \
 		ca-certificates \
+		coreutils \
+		dpkg-dev dpkg \
 		gcc \
 		gnupg \
 		libc-dev \
@@ -78,7 +80,13 @@ RUN set -ex; \
 	fi; \
 	\
 	cd /usr/src/bash; \
+	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+# update "config.guess" and "config.sub" to get more aggressively inclusive architecture support
+	for f in config.guess config.sub; do \
+		wget -O "support/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
+	done; \
 	./configure \
+		--build="$gnuArch" \
 		--enable-readline \
 		--with-curses \
 # musl does not implement brk/sbrk (they simply return -ENOMEM)
@@ -88,7 +96,7 @@ RUN set -ex; \
 		cat >&2 config.log; \
 		false; \
 	}; \
-	make -j "$(getconf _NPROCESSORS_ONLN)"; \
+	make -j "$(nproc)"; \
 	make install; \
 	cd /; \
 	rm -r /usr/src/bash; \