diff --git a/library/php b/library/php
index 2d3ac945792c6..e2d6cb1bb566d 100644
--- a/library/php
+++ b/library/php
@@ -4,74 +4,74 @@ Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon),
              Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/php.git
 
-Tags: 8.4.0RC1-cli-bookworm, 8.4-rc-cli-bookworm, 8.4.0RC1-bookworm, 8.4-rc-bookworm, 8.4.0RC1-cli, 8.4-rc-cli, 8.4.0RC1, 8.4-rc
+Tags: 8.4.0RC2-cli-bookworm, 8.4-rc-cli-bookworm, 8.4.0RC2-bookworm, 8.4-rc-bookworm, 8.4.0RC2-cli, 8.4-rc-cli, 8.4.0RC2, 8.4-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/bookworm/cli
 
-Tags: 8.4.0RC1-apache-bookworm, 8.4-rc-apache-bookworm, 8.4.0RC1-apache, 8.4-rc-apache
+Tags: 8.4.0RC2-apache-bookworm, 8.4-rc-apache-bookworm, 8.4.0RC2-apache, 8.4-rc-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/bookworm/apache
 
-Tags: 8.4.0RC1-fpm-bookworm, 8.4-rc-fpm-bookworm, 8.4.0RC1-fpm, 8.4-rc-fpm
+Tags: 8.4.0RC2-fpm-bookworm, 8.4-rc-fpm-bookworm, 8.4.0RC2-fpm, 8.4-rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/bookworm/fpm
 
-Tags: 8.4.0RC1-zts-bookworm, 8.4-rc-zts-bookworm, 8.4.0RC1-zts, 8.4-rc-zts
+Tags: 8.4.0RC2-zts-bookworm, 8.4-rc-zts-bookworm, 8.4.0RC2-zts, 8.4-rc-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/bookworm/zts
 
-Tags: 8.4.0RC1-cli-bullseye, 8.4-rc-cli-bullseye, 8.4.0RC1-bullseye, 8.4-rc-bullseye
+Tags: 8.4.0RC2-cli-bullseye, 8.4-rc-cli-bullseye, 8.4.0RC2-bullseye, 8.4-rc-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/bullseye/cli
 
-Tags: 8.4.0RC1-apache-bullseye, 8.4-rc-apache-bullseye
+Tags: 8.4.0RC2-apache-bullseye, 8.4-rc-apache-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/bullseye/apache
 
-Tags: 8.4.0RC1-fpm-bullseye, 8.4-rc-fpm-bullseye
+Tags: 8.4.0RC2-fpm-bullseye, 8.4-rc-fpm-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/bullseye/fpm
 
-Tags: 8.4.0RC1-zts-bullseye, 8.4-rc-zts-bullseye
+Tags: 8.4.0RC2-zts-bullseye, 8.4-rc-zts-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/bullseye/zts
 
-Tags: 8.4.0RC1-cli-alpine3.20, 8.4-rc-cli-alpine3.20, 8.4.0RC1-alpine3.20, 8.4-rc-alpine3.20, 8.4.0RC1-cli-alpine, 8.4-rc-cli-alpine, 8.4.0RC1-alpine, 8.4-rc-alpine
+Tags: 8.4.0RC2-cli-alpine3.20, 8.4-rc-cli-alpine3.20, 8.4.0RC2-alpine3.20, 8.4-rc-alpine3.20, 8.4.0RC2-cli-alpine, 8.4-rc-cli-alpine, 8.4.0RC2-alpine, 8.4-rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/alpine3.20/cli
 
-Tags: 8.4.0RC1-fpm-alpine3.20, 8.4-rc-fpm-alpine3.20, 8.4.0RC1-fpm-alpine, 8.4-rc-fpm-alpine
+Tags: 8.4.0RC2-fpm-alpine3.20, 8.4-rc-fpm-alpine3.20, 8.4.0RC2-fpm-alpine, 8.4-rc-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/alpine3.20/fpm
 
-Tags: 8.4.0RC1-zts-alpine3.20, 8.4-rc-zts-alpine3.20, 8.4.0RC1-zts-alpine, 8.4-rc-zts-alpine
+Tags: 8.4.0RC2-zts-alpine3.20, 8.4-rc-zts-alpine3.20, 8.4.0RC2-zts-alpine, 8.4-rc-zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/alpine3.20/zts
 
-Tags: 8.4.0RC1-cli-alpine3.19, 8.4-rc-cli-alpine3.19, 8.4.0RC1-alpine3.19, 8.4-rc-alpine3.19
+Tags: 8.4.0RC2-cli-alpine3.19, 8.4-rc-cli-alpine3.19, 8.4.0RC2-alpine3.19, 8.4-rc-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/alpine3.19/cli
 
-Tags: 8.4.0RC1-fpm-alpine3.19, 8.4-rc-fpm-alpine3.19
+Tags: 8.4.0RC2-fpm-alpine3.19, 8.4-rc-fpm-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/alpine3.19/fpm
 
-Tags: 8.4.0RC1-zts-alpine3.19, 8.4-rc-zts-alpine3.19
+Tags: 8.4.0RC2-zts-alpine3.19, 8.4-rc-zts-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 9a1e55bb514473362d21e8b4de02f1f43c040582
+GitCommit: 1571bdd69930a49ff10e4b9cf14007293fe335ef
 Directory: 8.4-rc/alpine3.19/zts
 
 Tags: 8.3.12-cli-bookworm, 8.3-cli-bookworm, 8-cli-bookworm, cli-bookworm, 8.3.12-bookworm, 8.3-bookworm, 8-bookworm, bookworm, 8.3.12-cli, 8.3-cli, 8-cli, cli, 8.3.12, 8.3, 8, latest