diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs
index c571381f11736daeb80354b1672bfc6f5be65fda..b7b8e17fa0c692d7f5ab31449008e9b97ecf01ce 100755
--- a/.gitlab/gen_ci.hs
+++ b/.gitlab/gen_ci.hs
@@ -309,6 +309,11 @@ opsysVariables _ FreeBSD = mconcat
   , "GHC_VERSION" =: "9.2.2"
   , "CABAL_INSTALL_VERSION" =: "3.2.0.0"
   ]
+opsysVariables ARMv7 (Linux distro) =
+  distroVariables distro <>
+  mconcat [ -- ld.gold is affected by #16177 and therefore cannot be used.
+            "CONFIGURE_ARGS" =: "LD=ld.lld"
+          ]
 opsysVariables _ (Linux distro) = distroVariables distro
 opsysVariables AArch64 (Darwin {}) =
   mconcat [ "NIX_SYSTEM" =: "aarch64-darwin"
@@ -342,13 +347,14 @@ opsysVariables _ _ = mempty
 
 distroVariables :: LinuxDistro -> Variables
 distroVariables Alpine = mconcat
-  [ "CONFIGURE_ARGS" =: "--disable-ld-override"
+  [ -- Due to #20266
+    "CONFIGURE_ARGS" =: "--disable-ld-override"
   , "INSTALL_CONFIGURE_ARGS" =: "--disable-ld-override"
   , "HADRIAN_ARGS" =: "--docs=no-sphinx"
--- encoding004: due to lack of locale support
--- T10458, ghcilink002: due to #17869
--- linker_unload_native: due to musl not supporting any means of probing dynlib dependencies
--- (see Note [Object unloading]).
+    -- encoding004: due to lack of locale support
+    -- T10458, ghcilink002: due to #17869
+    -- linker_unload_native: due to musl not supporting any means of probing dynlib dependencies
+    -- (see Note [Object unloading]).
   , "BROKEN_TESTS" =: "encoding004 T10458 ghcilink002 linker_unload_native"
   ]
 distroVariables Fedora33 = mconcat
diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml
index c3dd89ce5942c443be6432a2d9566ff3e5571737..2b18d545b47b412c318a67711a20cce589f85008 100644
--- a/.gitlab/jobs.yaml
+++ b/.gitlab/jobs.yaml
@@ -171,7 +171,7 @@
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-armv7-linux-deb10-validate",
       "BUILD_FLAVOUR": "validate",
-      "CONFIGURE_ARGS": "",
+      "CONFIGURE_ARGS": "LD=ld.lld ",
       "TEST_ENV": "armv7-linux-deb10-validate"
     }
   },
@@ -405,7 +405,7 @@
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-armv7-linux-deb10-validate",
       "BUILD_FLAVOUR": "validate",
-      "CONFIGURE_ARGS": "",
+      "CONFIGURE_ARGS": "LD=ld.lld ",
       "TEST_ENV": "armv7-linux-deb10-validate",
       "XZ_OPT": "-9"
     }
@@ -1766,7 +1766,7 @@
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-armv7-linux-deb10-perf",
       "BUILD_FLAVOUR": "perf",
-      "CONFIGURE_ARGS": "",
+      "CONFIGURE_ARGS": "LD=ld.lld ",
       "IGNORE_PERF_FAILURES": "all",
       "TEST_ENV": "armv7-linux-deb10-perf",
       "XZ_OPT": "-9"