diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8b77571..5e7c742 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -11,7 +11,7 @@ jobs:
   Build_PHP_Ubuntu:
     strategy:
       matrix:
-        version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         ubuntu-release-name: ['jammy', 'noble']
     environment:
       name: Build
diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml
index 0195c63..2180180 100644
--- a/.github/workflows/test-build.yaml
+++ b/.github/workflows/test-build.yaml
@@ -8,8 +8,9 @@ on:
 jobs:
   Build_PHP_Ubuntu_Test:
     strategy:
+      max-parallel: 1
       matrix:
-        version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         ubuntu-release-name: ['jammy', 'noble']
     environment:
       name: Build
diff --git a/Dockerfile b/Dockerfile
index 999d222..89b521d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,16 +7,18 @@ FROM ${BASE_IMAGE}:${PHP_VERSION}-${UBUNTU_RELEASE_NAME}
 
 ARG PHP_VERSION=8.2
 ARG TARGETPLATFORM
+ARG DATADOG_AGENT_VERSION=1.7.1
 
 ENV PHP_VERSION=${PHP_VERSION}
 
+
 USER root
 
 RUN apt-get update; apt install php${PHP_VERSION}-fpm msmtp curl -y && apt clean all; rm -rf /var/lib/apt/lists/* 
 
 # Routine to install newrelic agent
 RUN \
-  if [[ "${TARGETPLATFORM}" = "linux/arm64" ]] || [[ "$(uname -m)" = "aarch64" ]]; then exit 0; fi ; export NR_AGENT_VERSION="newrelic-php5-11.0.0.13-linux.tar.gz"; curl -so - https://download.newrelic.com/php_agent/archive/11.0.0.13/${NR_AGENT_VERSION} | tar zxf - && \
+  if [[ "${TARGETPLATFORM}" = "linux/arm64" ]] || [[ "$(uname -m)" = "aarch64" ]]; then exit 0; fi ; export NR_AGENT_VERSION="newrelic-php5-11.6.0.19-linux.tar.gz"; curl -so - https://download.newrelic.com/php_agent/archive/11.6.0.19/${NR_AGENT_VERSION} | tar zxf - && \
   cd newrelic-php* && NR_INSTALL_SILENT=1 NR_INSTALL_USE_CP_NOT_LN=1 ./newrelic-install install && \
   rm -rf /tmp/nrinstall* && \
   echo 'newrelic.daemon.start_timeout = "5s"' >> /etc/php/${PHP_VERSION}/mods-available/newrelic.ini && \
@@ -35,7 +37,7 @@ RUN \
 # You must set DD_AGENT_HOST and DD_TRACE_AGENT_PORT to point at your DD Agent
 # We also clean up whatever this config file layout is
 RUN \
-  curl -LO https://github.com/DataDog/dd-trace-php/releases/download/1.2.0/datadog-setup.php -o /tmp/datadog-setup.php && \
+  curl -LO https://github.com/DataDog/dd-trace-php/releases/download/${DATADOG_AGENT_VERSION}/datadog-setup.php -o /tmp/datadog-setup.php && \
   if [[ ${PHP_VERSION} = "5.6" ]] || [[ ${PHP_VERSION} = "7.0" ]]; then php datadog-setup.php --php-bin=all; else php datadog-setup.php --php-bin=all; fi && \
   rm -f /tmp/datadog-setup.php && \ 
   mv /etc/php/${PHP_VERSION}/cli/conf.d/98-ddtrace.ini /etc/php/${PHP_VERSION}/mods-available/ddtrace.ini && \
diff --git a/README.md b/README.md
index 21d3700..e52f477 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,7 @@ Images are available under the tags:
   * 10up/wp-php-fpm:8.1-ubuntu
   * 10up/wp-php-fpm:8.2-ubuntu
   * 10up/wp-php-fpm:8.3-ubuntu
+  * 10up/wp-php-fpm:8.4-ubuntu
 * Ubuntu 22.04 based (Github Packages)
   * ghcr.io/10up/wp-php-fpm:7.0-ubuntu
   * ghcr.io/10up/wp-php-fpm:7.1-ubuntu
@@ -96,6 +97,29 @@ Images are available under the tags:
   * ghcr.io/10up/wp-php-fpm:8.1-ubuntu
   * ghcr.io/10up/wp-php-fpm:8.2-ubuntu
   * ghcr.io/10up/wp-php-fpm:8.3-ubuntu
+  * ghcr.io/10up/wp-php-fpm:8.4-ubuntu
+* Ubuntu 24.04 based (Docker Hub)
+  * 10up/wp-php-cpm:7.0-noble
+  * 10up/wp-php-cpm:7.1-noble
+  * 10up/wp-php-cpm:7.2-noble
+  * 10up/wp-php-cpm:7.3-noble
+  * 10up/wp-php-cpm:7.4-noble
+  * 10up/wp-php-cpm:8.0-noble
+  * 10up/wp-php-cpm:8.1-noble
+  * 10up/wp-php-cpm:8.2-noble
+  * 10up/wp-php-cpm:8.3-noble
+  * 10up/wp-php-cpm:8.4-noble
+* Ubuntu 24.04 based (Github Packages)
+  * ghcr.io/10up/wp-php-cpm:7.0-noble
+  * ghcr.io/10up/wp-php-cpm:7.1-noble
+  * ghcr.io/10up/wp-php-cpm:7.2-noble
+  * ghcr.io/10up/wp-php-cpm:7.3-noble
+  * ghcr.io/10up/wp-php-cpm:7.4-noble
+  * ghcr.io/10up/wp-php-cpm:8.0-noble
+  * ghcr.io/10up/wp-php-cpm:8.1-noble
+  * ghcr.io/10up/wp-php-cpm:8.2-noble
+  * ghcr.io/10up/wp-php-cpm:8.3-noble
+  * ghcr.io/10up/wp-php-cpm:8.4-noble
 
 
 ## Support Level
@@ -107,4 +131,3 @@ Images are available under the tags:
 <p align="center">
 <a href="http://10up.com/contact/"><img src="https://10up.com/uploads/2016/10/10up-Github-Banner.png" width="850"></a>
 </p>
-