diff --git a/8.4-rc/alpine3.19/cli/Dockerfile b/8.4-rc/alpine3.19/cli/Dockerfile
index 60b685ffa..5fe857480 100644
--- a/8.4-rc/alpine3.19/cli/Dockerfile
+++ b/8.4-rc/alpine3.19/cli/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/alpine3.19/fpm/Dockerfile b/8.4-rc/alpine3.19/fpm/Dockerfile
index 9059b1032..aa1a2ab9b 100644
--- a/8.4-rc/alpine3.19/fpm/Dockerfile
+++ b/8.4-rc/alpine3.19/fpm/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/alpine3.19/zts/Dockerfile b/8.4-rc/alpine3.19/zts/Dockerfile
index a0a5419e9..0bbf2b84b 100644
--- a/8.4-rc/alpine3.19/zts/Dockerfile
+++ b/8.4-rc/alpine3.19/zts/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/alpine3.20/cli/Dockerfile b/8.4-rc/alpine3.20/cli/Dockerfile
index 722f9c64c..7613476a0 100644
--- a/8.4-rc/alpine3.20/cli/Dockerfile
+++ b/8.4-rc/alpine3.20/cli/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/alpine3.20/fpm/Dockerfile b/8.4-rc/alpine3.20/fpm/Dockerfile
index 2123d9874..b6abd9794 100644
--- a/8.4-rc/alpine3.20/fpm/Dockerfile
+++ b/8.4-rc/alpine3.20/fpm/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/alpine3.20/zts/Dockerfile b/8.4-rc/alpine3.20/zts/Dockerfile
index f59163529..375a347eb 100644
--- a/8.4-rc/alpine3.20/zts/Dockerfile
+++ b/8.4-rc/alpine3.20/zts/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/bookworm/apache/Dockerfile b/8.4-rc/bookworm/apache/Dockerfile
index 539977c25..1de901cfd 100644
--- a/8.4-rc/bookworm/apache/Dockerfile
+++ b/8.4-rc/bookworm/apache/Dockerfile
@@ -120,9 +120,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/bookworm/cli/Dockerfile b/8.4-rc/bookworm/cli/Dockerfile
index 08093af5a..a867ffbdd 100644
--- a/8.4-rc/bookworm/cli/Dockerfile
+++ b/8.4-rc/bookworm/cli/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/bookworm/fpm/Dockerfile b/8.4-rc/bookworm/fpm/Dockerfile
index f7d6a9323..73035df0e 100644
--- a/8.4-rc/bookworm/fpm/Dockerfile
+++ b/8.4-rc/bookworm/fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/bookworm/zts/Dockerfile b/8.4-rc/bookworm/zts/Dockerfile
index 679f10031..1eb373796 100644
--- a/8.4-rc/bookworm/zts/Dockerfile
+++ b/8.4-rc/bookworm/zts/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/bullseye/apache/Dockerfile b/8.4-rc/bullseye/apache/Dockerfile
index 44af25deb..02034bb38 100644
--- a/8.4-rc/bullseye/apache/Dockerfile
+++ b/8.4-rc/bullseye/apache/Dockerfile
@@ -118,9 +118,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/bullseye/cli/Dockerfile b/8.4-rc/bullseye/cli/Dockerfile
index 104a97c26..e19435b9d 100644
--- a/8.4-rc/bullseye/cli/Dockerfile
+++ b/8.4-rc/bullseye/cli/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/bullseye/fpm/Dockerfile b/8.4-rc/bullseye/fpm/Dockerfile
index 61e71c4c2..ab1fb0362 100644
--- a/8.4-rc/bullseye/fpm/Dockerfile
+++ b/8.4-rc/bullseye/fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/8.4-rc/bullseye/zts/Dockerfile b/8.4-rc/bullseye/zts/Dockerfile
index b63a7f4a6..d8ae58a8f 100644
--- a/8.4-rc/bullseye/zts/Dockerfile
+++ b/8.4-rc/bullseye/zts/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.0RC3
-ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc"
-ENV PHP_SHA256="e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6"
+ENV PHP_VERSION 8.4.0RC4
+ENV PHP_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz" PHP_ASC_URL="https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc"
+ENV PHP_SHA256="b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0"
 
 RUN set -eux; \
 	\
diff --git a/versions.json b/versions.json
index 60ebfd9ab..1be2e0d68 100644
--- a/versions.json
+++ b/versions.json
@@ -111,9 +111,9 @@
     "version": "8.3.14RC1"
   },
   "8.4-rc": {
-    "ascUrl": "https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz.asc",
-    "sha256": "e9e039c3b3517c7e64f80ca822fb92118f49823b50a98c326574d14ae28706f6",
-    "url": "https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz",
+    "ascUrl": "https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz.asc",
+    "sha256": "b3f8a19d845f4aa565015ff86196407eb533284eb4365ac5953f5e74ae61dcb0",
+    "url": "https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz",
     "variants": [
       "bookworm/cli",
       "bookworm/apache",
@@ -130,6 +130,6 @@
       "alpine3.19/fpm",
       "alpine3.19/zts"
     ],
-    "version": "8.4.0RC3"
+    "version": "8.4.0RC4"
   }
 }