diff --git a/8.4-rc/alpine3.19/cli/Dockerfile b/8.4-rc/alpine3.19/cli/Dockerfile
index 5987797a..918b0200 100644
--- a/8.4-rc/alpine3.19/cli/Dockerfile
+++ b/8.4-rc/alpine3.19/cli/Dockerfile
@@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -89,11 +87,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apk del --no-network .patch-deps; \
 	apk del --no-network .fetch-deps
diff --git a/8.4-rc/alpine3.19/fpm/Dockerfile b/8.4-rc/alpine3.19/fpm/Dockerfile
index ea2a7c4a..f690dafb 100644
--- a/8.4-rc/alpine3.19/fpm/Dockerfile
+++ b/8.4-rc/alpine3.19/fpm/Dockerfile
@@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -89,11 +87,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apk del --no-network .patch-deps; \
 	apk del --no-network .fetch-deps
diff --git a/8.4-rc/alpine3.19/zts/Dockerfile b/8.4-rc/alpine3.19/zts/Dockerfile
index cd14f661..a05e967a 100644
--- a/8.4-rc/alpine3.19/zts/Dockerfile
+++ b/8.4-rc/alpine3.19/zts/Dockerfile
@@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -89,11 +87,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apk del --no-network .patch-deps; \
 	apk del --no-network .fetch-deps
diff --git a/8.4-rc/alpine3.20/cli/Dockerfile b/8.4-rc/alpine3.20/cli/Dockerfile
index fba42d2a..71531186 100644
--- a/8.4-rc/alpine3.20/cli/Dockerfile
+++ b/8.4-rc/alpine3.20/cli/Dockerfile
@@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -89,11 +87,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apk del --no-network .patch-deps; \
 	apk del --no-network .fetch-deps
diff --git a/8.4-rc/alpine3.20/fpm/Dockerfile b/8.4-rc/alpine3.20/fpm/Dockerfile
index a69f7245..f55cdbcc 100644
--- a/8.4-rc/alpine3.20/fpm/Dockerfile
+++ b/8.4-rc/alpine3.20/fpm/Dockerfile
@@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -89,11 +87,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apk del --no-network .patch-deps; \
 	apk del --no-network .fetch-deps
diff --git a/8.4-rc/alpine3.20/zts/Dockerfile b/8.4-rc/alpine3.20/zts/Dockerfile
index 29deab84..f26cc56a 100644
--- a/8.4-rc/alpine3.20/zts/Dockerfile
+++ b/8.4-rc/alpine3.20/zts/Dockerfile
@@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -89,11 +87,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apk del --no-network .patch-deps; \
 	apk del --no-network .fetch-deps
diff --git a/8.4-rc/bookworm/apache/Dockerfile b/8.4-rc/bookworm/apache/Dockerfile
index 3597959b..f4a6b44e 100644
--- a/8.4-rc/bookworm/apache/Dockerfile
+++ b/8.4-rc/bookworm/apache/Dockerfile
@@ -123,8 +123,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -156,11 +154,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
diff --git a/8.4-rc/bookworm/cli/Dockerfile b/8.4-rc/bookworm/cli/Dockerfile
index 69aeb065..c6698c64 100644
--- a/8.4-rc/bookworm/cli/Dockerfile
+++ b/8.4-rc/bookworm/cli/Dockerfile
@@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -96,11 +94,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
diff --git a/8.4-rc/bookworm/fpm/Dockerfile b/8.4-rc/bookworm/fpm/Dockerfile
index acabf1c8..d3163a5a 100644
--- a/8.4-rc/bookworm/fpm/Dockerfile
+++ b/8.4-rc/bookworm/fpm/Dockerfile
@@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -96,11 +94,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
diff --git a/8.4-rc/bookworm/zts/Dockerfile b/8.4-rc/bookworm/zts/Dockerfile
index 749063f8..e6b66c52 100644
--- a/8.4-rc/bookworm/zts/Dockerfile
+++ b/8.4-rc/bookworm/zts/Dockerfile
@@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -96,11 +94,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
diff --git a/8.4-rc/bullseye/apache/Dockerfile b/8.4-rc/bullseye/apache/Dockerfile
index b0c59374..21ad1a36 100644
--- a/8.4-rc/bullseye/apache/Dockerfile
+++ b/8.4-rc/bullseye/apache/Dockerfile
@@ -121,8 +121,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -154,11 +152,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
diff --git a/8.4-rc/bullseye/cli/Dockerfile b/8.4-rc/bullseye/cli/Dockerfile
index 0f11fdd9..ea4b01d0 100644
--- a/8.4-rc/bullseye/cli/Dockerfile
+++ b/8.4-rc/bullseye/cli/Dockerfile
@@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -96,11 +94,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
diff --git a/8.4-rc/bullseye/fpm/Dockerfile b/8.4-rc/bullseye/fpm/Dockerfile
index e24c6675..7921b02e 100644
--- a/8.4-rc/bullseye/fpm/Dockerfile
+++ b/8.4-rc/bullseye/fpm/Dockerfile
@@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -96,11 +94,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
diff --git a/8.4-rc/bullseye/zts/Dockerfile b/8.4-rc/bullseye/zts/Dockerfile
index f7bd2972..f0ddad1a 100644
--- a/8.4-rc/bullseye/zts/Dockerfile
+++ b/8.4-rc/bullseye/zts/Dockerfile
@@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 ENV PHP_VERSION 8.4.0alpha1
 ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
 ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
 
 RUN set -eux; \
 	\
@@ -96,11 +94,10 @@ RUN set -eux; \
 	fi; \
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index 5d60eebd..b079ec6f 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -198,10 +198,6 @@ ENV GPG_KEYS {{
 ENV PHP_VERSION {{ .version }}
 ENV PHP_URL="{{ .url }}" PHP_ASC_URL="{{ .ascUrl // "" }}"
 ENV PHP_SHA256="{{ .sha256 // "" }}"
-{{ if .version == "8.4.0alpha1" then ( -}}
-ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
-ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
-{{ ) else "" end -}}
 
 RUN set -eux; \
 	\
@@ -244,11 +240,10 @@ RUN set -eux; \
 {{ if .version == "8.4.0alpha1" then ( -}}
 	\
 	# Add patch; see https://github.com/docker-library/php/pull/1526
-	curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
-	echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
-	TEMPFILE=$(mktemp); \
-	filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
-	mv $TEMPFILE php-pdo.patch; \
+	curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \
+	echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \
+	filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \
+	mv php-pdo.patch.filtered php-pdo.patch; \
 {{ ) else "" end -}}
 	\
 {{ if is_alpine then ( -}}