diff --git a/.gitlab/ci-images.yml b/.gitlab/ci-images.yml
index b2130f42ce..8b76d3952f 100644
--- a/.gitlab/ci-images.yml
+++ b/.gitlab/ci-images.yml
@@ -35,7 +35,7 @@ CentOS:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_TOKEN" $CI_REGISTRY
     - docker buildx bake --no-cache --pull --push $PHP_VERSION
 
-Alpine Compile Extension:
+Alpine:
   stage: ci-build
   rules:
     - when: manual
@@ -62,7 +62,7 @@ Alpine Compile Extension:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_TOKEN" $CI_REGISTRY
     - docker buildx bake --no-cache --pull --push $PHP_VERSION
 
-Ubuntu Bookworm:
+Bookworm:
   stage: ci-build
   rules:
     - when: manual
@@ -91,7 +91,7 @@ Ubuntu Bookworm:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_TOKEN" $CI_REGISTRY
     - docker buildx bake --no-cache --pull --push $PHP_VERSION
 
-Ubuntu Buster:
+Buster:
   stage: ci-build
   rules:
     - when: manual
diff --git a/dockerfiles/ci/alpine_compile_extension/docker-compose.yml b/dockerfiles/ci/alpine_compile_extension/docker-compose.yml
index 026aedf606..840f43f519 100644
--- a/dockerfiles/ci/alpine_compile_extension/docker-compose.yml
+++ b/dockerfiles/ci/alpine_compile_extension/docker-compose.yml
@@ -129,8 +129,8 @@ services:
       x-bake: *bake
       args:
         php_version: 8.4.0
-        php_url: https://downloads.php.net/~saki/php-8.4.0RC1.tar.gz
-        php_sha: ff924ce24493cd546c7227c2cedf75c32d23815b0a6e5c1658d9b005837631ff
+        php_url: https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.gz
+        php_sha: 3964fee49465e6fcae77ad030ae31aa720ade0a51c53df6e255e36eb867fd4b2
         php_api: 20240924
     volumes:
       - ../../:/app
diff --git a/dockerfiles/ci/bookworm/docker-compose.yml b/dockerfiles/ci/bookworm/docker-compose.yml
index 1f3f3b1e60..dc980743ef 100644
--- a/dockerfiles/ci/bookworm/docker-compose.yml
+++ b/dockerfiles/ci/bookworm/docker-compose.yml
@@ -22,8 +22,8 @@ services:
       args:
         <<: *build-base
         phpVersion: "8.4"
-        phpTarGzUrl: https://downloads.php.net/~saki/php-8.4.0RC3.tar.gz
-        phpSha256Hash: "1937d125c9bb42bc4d8dcd3b8bb25d377814aea50be492bbc64b3554b73af371"
+        phpTarGzUrl: https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.gz
+        phpSha256Hash: "3964fee49465e6fcae77ad030ae31aa720ade0a51c53df6e255e36eb867fd4b2"
 
   php-8.3:
     image: datadog/dd-trace-ci:php-8.3_bookworm-$BOOKWORM_NEXT_VERSION
diff --git a/dockerfiles/ci/buster/docker-compose.yml b/dockerfiles/ci/buster/docker-compose.yml
index 8a553367e5..b900ee38f5 100644
--- a/dockerfiles/ci/buster/docker-compose.yml
+++ b/dockerfiles/ci/buster/docker-compose.yml
@@ -17,8 +17,8 @@ services:
       x-bake: *bake
       args:
         phpVersion: "8.4"
-        phpTarGzUrl: https://downloads.php.net/~saki/php-8.4.0RC3.tar.gz
-        phpSha256Hash: "1937d125c9bb42bc4d8dcd3b8bb25d377814aea50be492bbc64b3554b73af371"
+        phpTarGzUrl: https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.gz
+        phpSha256Hash: "3964fee49465e6fcae77ad030ae31aa720ade0a51c53df6e255e36eb867fd4b2"
 
   php-8.3:
     image: datadog/dd-trace-ci:php-8.3_buster
diff --git a/dockerfiles/ci/centos/7/docker-compose.yml b/dockerfiles/ci/centos/7/docker-compose.yml
index 20e9a2a83a..d37da8a6c8 100644
--- a/dockerfiles/ci/centos/7/docker-compose.yml
+++ b/dockerfiles/ci/centos/7/docker-compose.yml
@@ -117,6 +117,6 @@ services:
       x-bake: *bake
       args:
         phpVersion: "8.4"
-        phpTarGzUrl: https://downloads.php.net/~saki/php-8.4.0RC3.tar.gz
-        phpSha256Hash: "1937d125c9bb42bc4d8dcd3b8bb25d377814aea50be492bbc64b3554b73af371"
+        phpTarGzUrl: https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.gz
+        phpSha256Hash: "3964fee49465e6fcae77ad030ae31aa720ade0a51c53df6e255e36eb867fd4b2"
     image: 'datadog/dd-trace-ci:php-8.4_centos-7'
diff --git a/dockerfiles/ci/windows/docker-compose.yml b/dockerfiles/ci/windows/docker-compose.yml
index db9d073d47..3e7bfb0e37 100644
--- a/dockerfiles/ci/windows/docker-compose.yml
+++ b/dockerfiles/ci/windows/docker-compose.yml
@@ -87,8 +87,8 @@ services:
       args:
         phpVersion: "8.4.0RC3"
         vsVersion: "vs17"
-        phpTarGzUrl: https://downloads.php.net/~saki/php-8.4.0RC3.tar.gz
-        phpSha256Hash: "1937d125c9bb42bc4d8dcd3b8bb25d377814aea50be492bbc64b3554b73af371"
+        phpTarGzUrl: https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.gz
+        phpSha256Hash: "3964fee49465e6fcae77ad030ae31aa720ade0a51c53df6e255e36eb867fd4b2"
 
   php-8.3:
     image: datadog/dd-trace-ci:php-8.3_windows