diff --git a/Dockerfile b/Dockerfile
index a1f93cba8e..7b5c4322a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ARG DEVELOPMENT_BUILD
 ###############################################################################
 # The base image for regular Debian-based images
 ###############################################################################
-FROM php:8.3-apache-trixie AS cdash-debian-intermediate
+FROM php:8.4-apache-trixie AS cdash-debian-intermediate
 
 ARG BASE_IMAGE
 ARG DEVELOPMENT_BUILD
@@ -133,7 +133,7 @@ ENTRYPOINT ["/bin/bash", "/cdash/docker/docker-entrypoint.sh"]
 # The base image for UBI-based images
 ###############################################################################
 
-FROM registry.access.redhat.com/ubi9/php-83 AS cdash-ubi-intermediate
+FROM registry.access.redhat.com/ubi10/php-84 AS cdash-ubi-intermediate
 
 ARG BASE_IMAGE
 ARG DEVELOPMENT_BUILD
@@ -164,14 +164,7 @@ RUN dnf install -y \
       git \
       vim \
       unzip \
-      zip \
-      #> cdash
-      php-bcmath \
-      php-gd \
-      php-ldap \
-      php-mbstring \
-      php-pdo \
-      php-opcache
+      zip
 
 RUN if [ "$DEVELOPMENT_BUILD" = '1' ]; then \
       dnf install -y \
@@ -181,18 +174,11 @@ RUN if [ "$DEVELOPMENT_BUILD" = '1' ]; then \
           --noplugins \
           --setopt=install_weak_deps=0 \
           rsync \
-      #> A horrible hack to get a newer version of CMake.  As of the time of this
-      #> writing, Red Hat UBI uses CMake 3.20, while our scripts require CMake>=3.22.
-      #> This should be replaced with a more acceptable solution at a future point
-      #> in time, whenever Red Had updates the default version of CMake.
-          python-pip && \
-      pip install cmake --upgrade && \
-      dnf remove -y python-pip; \
+          cmake; \
     fi
 
 # certs, timezone, accounts
 RUN chmod -R g=u,o-w /etc/pki/ca-trust/extracted /etc/pki/ca-trust/source/anchors && \
-	  update-ca-trust enable && \
 	  update-ca-trust extract
 
 # Allow PHP to access all environment variables.
diff --git a/composer.json b/composer.json
index 843a78c45f..de5435c5ef 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     "wiki": "http://public.kitware.com/Wiki/CDash"
   },
   "require": {
-    "php": "^8.3",
+    "php": "^8.4",
     "ext-bcmath": "*",
     "ext-curl": "*",
     "ext-dom": "*",
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index e5569914d5..4715c87b99 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -7977,12 +7977,6 @@ parameters:
 			count: 1
 			path: app/cdash/app/Model/BuildConfigure.php
 
-		-
-			rawMessage: If condition is always false.
-			identifier: if.alwaysFalse
-			count: 1
-			path: app/cdash/app/Model/BuildConfigure.php
-
 		-
 			rawMessage: 'Method CDash\Model\BuildConfigure::AddLabel() has parameter $label with no type specified.'
 			identifier: missingType.parameter
diff --git a/resources/providers/PingIdentity/composer.json b/resources/providers/PingIdentity/composer.json
index d054ddbdc2..1d9fa76f96 100644
--- a/resources/providers/PingIdentity/composer.json
+++ b/resources/providers/PingIdentity/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^8.3",
+        "php": "^8.4",
         "ext-json": "*",
         "socialiteproviders/manager": "^4.8"
     },