diff --git a/10/bullseye/Dockerfile b/10/bullseye/Dockerfile
index d4c98ba0e4..a30f944695 100644
--- a/10/bullseye/Dockerfile
+++ b/10/bullseye/Dockerfile
@@ -110,11 +110,11 @@ RUN set -ex; \
 # let's build binaries from their published source packages
 			echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
 			\
+			savedAptMark="$(apt-mark showmanual)"; \
+			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
 			\
-			savedAptMark="$(apt-mark showmanual)"; \
-			\
 # create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
 			apt-get update; \
 			apt-get install -y --no-install-recommends dpkg-dev; \
diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile
index 0fd06ac1c0..2e60a4abc1 100644
--- a/10/stretch/Dockerfile
+++ b/10/stretch/Dockerfile
@@ -110,11 +110,11 @@ RUN set -ex; \
 # let's build binaries from their published source packages
 			echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
 			\
+			savedAptMark="$(apt-mark showmanual)"; \
+			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
 			\
-			savedAptMark="$(apt-mark showmanual)"; \
-			\
 # create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
 			apt-get update; \
 			apt-get install -y --no-install-recommends dpkg-dev; \
diff --git a/11/bullseye/Dockerfile b/11/bullseye/Dockerfile
index d7aebb5e45..5cf480b37d 100644
--- a/11/bullseye/Dockerfile
+++ b/11/bullseye/Dockerfile
@@ -110,11 +110,11 @@ RUN set -ex; \
 # let's build binaries from their published source packages
 			echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
 			\
+			savedAptMark="$(apt-mark showmanual)"; \
+			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
 			\
-			savedAptMark="$(apt-mark showmanual)"; \
-			\
 # create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
 			apt-get update; \
 			apt-get install -y --no-install-recommends dpkg-dev; \
diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile
index ed859cdda8..bd2c0c5a2f 100644
--- a/11/stretch/Dockerfile
+++ b/11/stretch/Dockerfile
@@ -110,14 +110,17 @@ RUN set -ex; \
 # let's build binaries from their published source packages
 			echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
 			\
+			savedAptMark="$(apt-mark showmanual)"; \
+			\
 # https://github.com/docker-library/postgres/issues/484 (clang-6.0 required, only available in stretch-backports)
 			echo 'deb http://deb.debian.org/debian stretch-backports main' >> /etc/apt/sources.list.d/pgdg.list; \
+# ... and thanks to https://salsa.debian.org/postgresql/postgresql/-/commit/e914bb060a9b58dae661f1c3439de5ffe4ba62d0 it doesn't get pulled in automatically any more (but if we install it manually it gets used by the build appropriately 🙈)
+			apt-get update; \
+			apt-get install -y --no-install-recommends clang-6.0; \
 			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
 			\
-			savedAptMark="$(apt-mark showmanual)"; \
-			\
 # create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
 			apt-get update; \
 			apt-get install -y --no-install-recommends dpkg-dev; \
diff --git a/12/bullseye/Dockerfile b/12/bullseye/Dockerfile
index 1bf1ae36b2..24bdb6fd53 100644
--- a/12/bullseye/Dockerfile
+++ b/12/bullseye/Dockerfile
@@ -110,11 +110,11 @@ RUN set -ex; \
 # let's build binaries from their published source packages
 			echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
 			\
+			savedAptMark="$(apt-mark showmanual)"; \
+			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
 			\
-			savedAptMark="$(apt-mark showmanual)"; \
-			\
 # create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
 			apt-get update; \
 			apt-get install -y --no-install-recommends dpkg-dev; \
diff --git a/13/bullseye/Dockerfile b/13/bullseye/Dockerfile
index b10fdda9e4..2cc6e62029 100644
--- a/13/bullseye/Dockerfile
+++ b/13/bullseye/Dockerfile
@@ -110,11 +110,11 @@ RUN set -ex; \
 # let's build binaries from their published source packages
 			echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
 			\
+			savedAptMark="$(apt-mark showmanual)"; \
+			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
 			\
-			savedAptMark="$(apt-mark showmanual)"; \
-			\
 # create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
 			apt-get update; \
 			apt-get install -y --no-install-recommends dpkg-dev; \
diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile
index 0b2ad5fadd..baff4ca137 100644
--- a/14/bullseye/Dockerfile
+++ b/14/bullseye/Dockerfile
@@ -110,11 +110,11 @@ RUN set -ex; \
 # let's build binaries from their published source packages
 			echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
 			\
+			savedAptMark="$(apt-mark showmanual)"; \
+			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
 			\
-			savedAptMark="$(apt-mark showmanual)"; \
-			\
 # create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
 			apt-get update; \
 			apt-get install -y --no-install-recommends dpkg-dev; \
diff --git a/9.6/bullseye/Dockerfile b/9.6/bullseye/Dockerfile
index ad2776ef0f..d57ba05c72 100644
--- a/9.6/bullseye/Dockerfile
+++ b/9.6/bullseye/Dockerfile
@@ -110,11 +110,11 @@ RUN set -ex; \
 # let's build binaries from their published source packages
 			echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
 			\
+			savedAptMark="$(apt-mark showmanual)"; \
+			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
 			\
-			savedAptMark="$(apt-mark showmanual)"; \
-			\
 # create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
 			apt-get update; \
 			apt-get install -y --no-install-recommends dpkg-dev; \
diff --git a/9.6/stretch/Dockerfile b/9.6/stretch/Dockerfile
index 1ae8d9c32f..bd97fed3e5 100644
--- a/9.6/stretch/Dockerfile
+++ b/9.6/stretch/Dockerfile
@@ -110,11 +110,11 @@ RUN set -ex; \
 # let's build binaries from their published source packages
 			echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
 			\
+			savedAptMark="$(apt-mark showmanual)"; \
+			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
 			\
-			savedAptMark="$(apt-mark showmanual)"; \
-			\
 # create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
 			apt-get update; \
 			apt-get install -y --no-install-recommends dpkg-dev; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 3228be81f3..39ae69fbd4 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -104,16 +104,19 @@ RUN set -ex; \
 # let's build binaries from their published source packages
 			echo "deb-src $aptRepo" > /etc/apt/sources.list.d/pgdg.list; \
 			\
+			savedAptMark="$(apt-mark showmanual)"; \
+			\
 {{ if env.variant == "stretch" and .major >= 11 then ( -}}
 # https://github.com/docker-library/postgres/issues/484 (clang-6.0 required, only available in stretch-backports)
 			echo 'deb http://deb.debian.org/debian {{ env.variant }}-backports main' >> /etc/apt/sources.list.d/pgdg.list; \
+# ... and thanks to https://salsa.debian.org/postgresql/postgresql/-/commit/e914bb060a9b58dae661f1c3439de5ffe4ba62d0 it doesn't get pulled in automatically any more (but if we install it manually it gets used by the build appropriately 🙈)
+			apt-get update; \
+			apt-get install -y --no-install-recommends clang-6.0; \
 			\
 {{ ) else "" end -}}
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
 			\
-			savedAptMark="$(apt-mark showmanual)"; \
-			\
 # create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
 			apt-get update; \
 			apt-get install -y --no-install-recommends dpkg-dev; \