diff --git a/.env b/.env
index 4c1dcbf009..84dd60be20 100644
--- a/.env
+++ b/.env
@@ -33,12 +33,14 @@ DRUPAL_TAG=11-4.77.0
 
 # Linux (uid 1000 gid 1000)
 
-PHP_TAG=8.3-dev-4.64.0
+PHP_TAG=8.4-dev-4.64.0
+#PHP_TAG=8.3-dev-4.64.0
 #PHP_TAG=8.2-dev-4.64.0
 #PHP_TAG=8.1-dev-4.64.0
 
 # macOS (uid 501 gid 20)
 
+#PHP_TAG=8.4-dev-macos-4.64.0
 #PHP_TAG=8.3-dev-macos-4.64.0
 #PHP_TAG=8.2-dev-macos-4.64.0
 #PHP_TAG=8.1-dev-macos-4.64.0
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 8239f8bcdc..53c2e10f31 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -15,8 +15,10 @@ jobs:
     strategy:
       matrix:
         drupal_ver: [ 11,10,7 ]
-        php_ver: [ '8.3','8.2','8.1' ]
+        php_ver: [ '8.4','8.3','8.2','8.1' ]
         exclude:
+        - drupal_ver: 7
+          php_ver: '8.4' 
         - drupal_ver: 7
           php_ver: '8.3'
         - drupal_ver: 11
diff --git a/Makefile b/Makefile
index 4fd12c315a..d903f82dc5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ include docker.mk
 .PHONY: test
 
 DRUPAL_VER ?= 11
-PHP_VER ?= 8.3
+PHP_VER ?= 8.4
 
 test:
 	cd ./tests/$(DRUPAL_VER) && PHP_VER=$(PHP_VER) ./run.sh
diff --git a/README.md b/README.md
index 7e3cd78f2a..8afd75dc4c 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ The Drupal stack consist of the following containers:
 | [Nginx]         | 1.27, 1.26              | [wodby/nginx]                | ✓             | ✓                  |
 | [Apache]        | 2.4                     | [wodby/apache]               | ✓             |                    |
 | [Drupal]        | 11, 10, 7               | [wodby/drupal]               | ✓             | ✓                  |
-| [PHP]           | 8.3, 8.2, 8.1           | [wodby/drupal-php]           | ✓             |                    |
+| [PHP]           | 8.4, 8.3, 8.2, 8.1      | [wodby/drupal-php]           | ✓             |                    |
 | Crond           |                         | [wodby/drupal-php]           | ✓             | ✓                  |
 | [MariaDB]       | 11.4, 10.11, 10.6, 10.5 | [wodby/mariadb]              | ✓             | ✓                  |
 | [PostgreSQL]    | 16, 15, 14, 13, 12      | [wodby/postgres]             | ✓             |                    |