diff --git a/prior/8.10.1.Dockerfile b/prior/8.10.1.Dockerfile
index 61f843fc4e4ba4f362da67955b0560d71b0b8c15..c0b745a206e3d802cf7bb6af88d24bd3b70a5a1b 100644
--- a/prior/8.10.1.Dockerfile
+++ b/prior/8.10.1.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && autoreconf \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/8.10.4.Dockerfile b/prior/8.10.4.Dockerfile
index 0f54ed39a163b4d6955635ad1422e09aeff09f02..d2460d899dafa8c979d57ee7637f5d5e67fba802 100644
--- a/prior/8.10.4.Dockerfile
+++ b/prior/8.10.4.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && autoreconf \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/8.10.5.Dockerfile b/prior/8.10.5.Dockerfile
index bd828533cabc030b1bbc16203887ce173d2109b4..d941c03eb7a23711ed041d2aaf91f2ab32b9a90f 100644
--- a/prior/8.10.5.Dockerfile
+++ b/prior/8.10.5.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && autoreconf \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/8.10.6.Dockerfile b/prior/8.10.6.Dockerfile
index b8f8a106d3a2c0b885027aae3464b12a1f77eda7..733d11097f325c8c5bd8f65c0478dbb0816e51f0 100644
--- a/prior/8.10.6.Dockerfile
+++ b/prior/8.10.6.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && autoreconf \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/8.10.7.Dockerfile b/prior/8.10.7.Dockerfile
index 699f6d7d86ce9d2eff47522bf51545bfe583f02e..06130969b2f5e1d97ce07e589f31952eb3bb9dc6 100644
--- a/prior/8.10.7.Dockerfile
+++ b/prior/8.10.7.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && autoreconf \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/8.8.4.Dockerfile b/prior/8.8.4.Dockerfile
index 4aa874433918ba13f77f0c3fcbe4ad9e17a728f6..d99360267dc37ce5a52fa376c7f7b7f9bbe1e98c 100644
--- a/prior/8.8.4.Dockerfile
+++ b/prior/8.8.4.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && autoreconf \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/9.0.1.Dockerfile b/prior/9.0.1.Dockerfile
index 166a5fd76cbafb5025fc66f68b63f7a3c72f8fa0..ac747a515b394c384e484c66a72b2ae3501ab918 100644
--- a/prior/9.0.1.Dockerfile
+++ b/prior/9.0.1.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && autoreconf \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/9.0.2.Dockerfile b/prior/9.0.2.Dockerfile
index 370ae55acba1aa051a622f0c473c5819d9e18ece..ccc1f38fec6a5012a226965dacaa4543b8e903c2 100644
--- a/prior/9.0.2.Dockerfile
+++ b/prior/9.0.2.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && autoreconf \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/9.2.1.Dockerfile b/prior/9.2.1.Dockerfile
index c293fa51c124c3d2ac39832985e8e6cc99f78035..db66300ba5fbea92c59c74159c2d49d43589a493 100644
--- a/prior/9.2.1.Dockerfile
+++ b/prior/9.2.1.Dockerfile
@@ -57,7 +57,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && autoreconf \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/9.2.2.Dockerfile b/prior/9.2.2.Dockerfile
index 8f4c7020df8520754111c2a9c3205674d3414cf1..280648721119a2bcf879386af01d3dac996c2ffe 100644
--- a/prior/9.2.2.Dockerfile
+++ b/prior/9.2.2.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && autoreconf \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/9.2.3.Dockerfile b/prior/9.2.3.Dockerfile
index 5775bde6d1f5e5b2af38e3737c3140b5b69939a6..2c848e1e4412c3f6bc81df541fc506bffdbd72ea 100644
--- a/prior/9.2.3.Dockerfile
+++ b/prior/9.2.3.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && ./boot \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/9.2.4.Dockerfile b/prior/9.2.4.Dockerfile
index 17886419fd0d9977a790f39b0e35e639bee7fa9f..60a15938a412831931662d6d1bdc347727da6414 100644
--- a/prior/9.2.4.Dockerfile
+++ b/prior/9.2.4.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && ./boot \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/9.2.5.Dockerfile b/prior/9.2.5.Dockerfile
index 96dba363323e78b49b0189dcc15f46d05f4e31ca..79693f660d7e20d68efff593fe3fcf9879b8a700 100644
--- a/prior/9.2.5.Dockerfile
+++ b/prior/9.2.5.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && ./boot \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/9.2.6.Dockerfile b/prior/9.2.6.Dockerfile
index 9f542546a5465b76054c3adc458b72182b5b5143..ef7ac839b463193880550832305767eb9bc9fd37 100644
--- a/prior/9.2.6.Dockerfile
+++ b/prior/9.2.6.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && ./boot \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/9.2.7.Dockerfile b/prior/9.2.7.Dockerfile
index 18c7ad53ef421e7e64c7e223079fd099db90f4bc..3d622c7abfd899e10b140447b303af37294d636f 100644
--- a/prior/9.2.7.Dockerfile
+++ b/prior/9.2.7.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && ./boot \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/9.2.8.Dockerfile b/prior/9.2.8.Dockerfile
index e4b665b3bbb14ce166e2497f5b6173c9b305a5e6..de4d4cf09571a542ded693bbadc5d8351f592345 100644
--- a/prior/9.2.8.Dockerfile
+++ b/prior/9.2.8.Dockerfile
@@ -52,7 +52,11 @@ RUN cd /tmp \
   && echo 'BUILD_SPHINX_PS=NO' >> mk/build.mk \
   && echo 'BUILD_SPHINX_PDF=NO' >> mk/build.mk \
   && ./boot \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   ## Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   ## so we can match the llvm vendor string alpine uses
   && sed -i -e 's/unknown-linux-gnueabihf/alpine-linux/g' llvm-targets \
diff --git a/prior/9.4.1.Dockerfile b/prior/9.4.1.Dockerfile
index 67d3ebbc0328919a464cd117129dd2030a34f246..5c82118d469025cd33de2f2a2e4360734389f00d 100644
--- a/prior/9.4.1.Dockerfile
+++ b/prior/9.4.1.Dockerfile
@@ -42,7 +42,11 @@ RUN cd /tmp \
   && tar xf ghc-$GHC_VERSION-src.tar.xz \
   && cd ghc-$GHC_VERSION \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Use the LLVM backend
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
diff --git a/prior/9.4.2.Dockerfile b/prior/9.4.2.Dockerfile
index 5772bf4a96a07f640a01e4e5b6014c1133ca42e2..2e8261dc62b5edb922cdfccdc0bb82e973e6cc00 100644
--- a/prior/9.4.2.Dockerfile
+++ b/prior/9.4.2.Dockerfile
@@ -42,7 +42,11 @@ RUN cd /tmp \
   && tar xf ghc-$GHC_VERSION-src.tar.xz \
   && cd ghc-$GHC_VERSION \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Use the LLVM backend
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
diff --git a/prior/9.4.3.Dockerfile b/prior/9.4.3.Dockerfile
index 29bc62cf2aedd2a89b3038061c7970e5fd177a74..e07f2ad4589f2a50eb2a3804a1f6618ddf4659ca 100644
--- a/prior/9.4.3.Dockerfile
+++ b/prior/9.4.3.Dockerfile
@@ -42,7 +42,11 @@ RUN cd /tmp \
   && tar xf ghc-$GHC_VERSION-src.tar.xz \
   && cd ghc-$GHC_VERSION \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Use the LLVM backend
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
diff --git a/prior/9.4.4.Dockerfile b/prior/9.4.4.Dockerfile
index 60cc63d8dc18fdf215b37189e8411c133483f862..9f6cd2ddd10c1a7e8b1d5fdc726b5febcea200aa 100644
--- a/prior/9.4.4.Dockerfile
+++ b/prior/9.4.4.Dockerfile
@@ -42,7 +42,11 @@ RUN cd /tmp \
   && tar xf ghc-$GHC_VERSION-src.tar.xz \
   && cd ghc-$GHC_VERSION \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Use the LLVM backend
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
diff --git a/prior/9.4.5.Dockerfile b/prior/9.4.5.Dockerfile
index fcd37d38b243afcde8c551e907e29ae26291c1ae..ed9fc3244040e2d811d05a1cdd794a399de41eff 100644
--- a/prior/9.4.5.Dockerfile
+++ b/prior/9.4.5.Dockerfile
@@ -42,7 +42,11 @@ RUN cd /tmp \
   && tar xf ghc-$GHC_VERSION-src.tar.xz \
   && cd ghc-$GHC_VERSION \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Use the LLVM backend
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
diff --git a/prior/9.4.6.Dockerfile b/prior/9.4.6.Dockerfile
index 8437ba8458ec37fa017db576a9d366b347f5517f..e4ceec56512daa2fac308a33e7f9df7dd4da8c01 100644
--- a/prior/9.4.6.Dockerfile
+++ b/prior/9.4.6.Dockerfile
@@ -43,7 +43,11 @@ RUN cd /tmp \
   && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \
   && cd "ghc-$GHC_VERSION" \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Use the LLVM backend
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
diff --git a/prior/9.4.7.Dockerfile b/prior/9.4.7.Dockerfile
index 3fe963dc91276afbbe40dc0a782945cf9368385c..957fd07f9ab664ffc8d240ca09e169232dfb1ab3 100644
--- a/prior/9.4.7.Dockerfile
+++ b/prior/9.4.7.Dockerfile
@@ -43,7 +43,11 @@ RUN cd /tmp \
   && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \
   && cd "ghc-$GHC_VERSION" \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Use the LLVM backend
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
diff --git a/prior/9.4.8.Dockerfile b/prior/9.4.8.Dockerfile
index dc125846a9ec2420dba878f40cb035a7347d0a31..cb51ef5b8fae554a405ceda041f2cd76de1ee96a 100644
--- a/prior/9.4.8.Dockerfile
+++ b/prior/9.4.8.Dockerfile
@@ -43,7 +43,11 @@ RUN cd /tmp \
   && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \
   && cd "ghc-$GHC_VERSION" \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   ## Use the LLVM backend
   ## Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   ## so we can match the llvm vendor string alpine uses
diff --git a/prior/9.6.1.Dockerfile b/prior/9.6.1.Dockerfile
index c96949a81ddf85b7eb51c6557f1e5f484259ff82..f1565753c4425ad832223f30cb590d27f4131f84 100644
--- a/prior/9.6.1.Dockerfile
+++ b/prior/9.6.1.Dockerfile
@@ -42,7 +42,11 @@ RUN cd /tmp \
   && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \
   && cd "ghc-$GHC_VERSION" \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Use the LLVM backend
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
diff --git a/prior/9.6.2.Dockerfile b/prior/9.6.2.Dockerfile
index 2d29a61d4dc6be8e737d9efbe83289907060d389..ce132bda176f51024ddcd8e888e7a5d07ca47e4b 100644
--- a/prior/9.6.2.Dockerfile
+++ b/prior/9.6.2.Dockerfile
@@ -43,7 +43,11 @@ RUN cd /tmp \
   && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \
   && cd "ghc-$GHC_VERSION" \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   # Use the LLVM backend
   # Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   # so we can match the llvm vendor string alpine uses
diff --git a/prior/9.6.3.Dockerfile b/prior/9.6.3.Dockerfile
index 57a940f8b5f699a1621a941b55a62f7de8a6aba5..d5ed4c1392517372cf9a06035fdeb6891a7fa53f 100644
--- a/prior/9.6.3.Dockerfile
+++ b/prior/9.6.3.Dockerfile
@@ -122,7 +122,11 @@ RUN cd /tmp \
   ## Install GHC
   && tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \
   && cd ghc-"$GHC_VERSION"-*-alpine-linux \
-  && ./configure --disable-ld-override \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override \
   && make install \
   ## Install Stack
   && cd /tmp \
diff --git a/prior/9.6.4.Dockerfile b/prior/9.6.4.Dockerfile
index 8e298e83eae10b95a2fb64736afa70406c51ca3c..d1fd92bbc1a8665ed99d8aea4552f75251332146 100644
--- a/prior/9.6.4.Dockerfile
+++ b/prior/9.6.4.Dockerfile
@@ -43,7 +43,11 @@ RUN cd /tmp \
   && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \
   && cd "ghc-$GHC_VERSION" \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   ## Use the LLVM backend
   ## Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   ## so we can match the llvm vendor string alpine uses
diff --git a/prior/9.6.5.Dockerfile b/prior/9.6.5.Dockerfile
index 0107db6af8e27d331edab68d2b0849aa13e28b5a..1340cf6cee29463198971a4cbf6e82bc60d79fa7 100644
--- a/prior/9.6.5.Dockerfile
+++ b/prior/9.6.5.Dockerfile
@@ -50,7 +50,11 @@ RUN cd /tmp \
   && patch -p0 <"$GHC_VERSION.patch" \
   ## Configure and build
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   ## Use the LLVM backend
   ## Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   ## so we can match the llvm vendor string alpine uses
diff --git a/prior/9.6.6.Dockerfile b/prior/9.6.6.Dockerfile
index 61004a993c16fa1aabbdfb7777c2a07019d07ae9..52480b01e87e61227ed07d22707f8c223b70ac30 100644
--- a/prior/9.6.6.Dockerfile
+++ b/prior/9.6.6.Dockerfile
@@ -50,7 +50,11 @@ RUN cd /tmp \
   && patch -p0 <"$GHC_VERSION.patch" \
   ## Configure and build
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   ## Use the LLVM backend
   ## Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   ## so we can match the llvm vendor string alpine uses
diff --git a/prior/9.8.1.Dockerfile b/prior/9.8.1.Dockerfile
index 748b3e7b49254d2191c932e1c4f9db1b0d73b62c..c83125145b3a8ec82d1ef6d7fe0a45ba8047d566 100644
--- a/prior/9.8.1.Dockerfile
+++ b/prior/9.8.1.Dockerfile
@@ -43,7 +43,11 @@ RUN cd /tmp \
   && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \
   && cd "ghc-$GHC_VERSION" \
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   ## Use the LLVM backend
   ## Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   ## so we can match the llvm vendor string alpine uses
diff --git a/prior/9.8.2.Dockerfile b/prior/9.8.2.Dockerfile
index 3d526bd8085397b9d8ba259501abf9812d28ba05..5c2b002d339f1d031d4a3c85bcddf32e4ca0e633 100644
--- a/prior/9.8.2.Dockerfile
+++ b/prior/9.8.2.Dockerfile
@@ -50,7 +50,11 @@ RUN cd /tmp \
   && patch -p0 <"$GHC_VERSION.patch" \
   ## Configure and build
   && ./boot.source \
-  && ./configure --disable-ld-override LD=ld.gold \
+  && ./configure \
+    --build=$(uname -m)-alpine-linux \
+    --host=$(uname -m)-alpine-linux \
+    --target=$(uname -m)-alpine-linux \
+    --disable-ld-override LD=ld.gold \
   ## Use the LLVM backend
   ## Switch llvm-targets from unknown-linux-gnueabihf->alpine-linux
   ## so we can match the llvm vendor string alpine uses