diff --git a/Makefile b/Makefile
index 11d4901..28cbe97 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ endif
 DRUSH=$(EXEC) ./bin/drush
 DRUSH_INSTALL=$(DRUSH) -y site:install --account-pass=password
 GIT_SWITCH=cd app && git switch
-PHP_VERSION=8.3
+PHP_VERSION=8.4
 
 clean: composer minimal login
 
@@ -96,7 +96,7 @@ phpstan-baseline:
 	$(GIT_SWITCH) 11.1.x
 	make clean
 
-11.x: php8.3
+11.x: php8.4
 	$(GIT_SWITCH) 11.x
 	make clean
 
@@ -114,3 +114,6 @@ php8.2:
 
 php8.3:
 	make start -e PHP_VERSION=8.3
+
+php8.4:
+	make start -e PHP_VERSION=8.4
diff --git a/README.md b/README.md
index 019339a..f0fce78 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ Make commands should be executed on the host machine.
 * `phpstan` - runs phpstan for core
 * `phpstan-baseline` - generates phpstan baseline for core
 * `10.2|10.3|10.4|10.5|11.0|11.1|11.x` - provides a clean environment with the specified Drupal version
-* `php8.1|php8.2|php8.3` - starts the stack with the specified php version
+* `php8.1|php8.2|php8.3|php8.4` - starts the stack with the specified php version
 
 ## PhpStorm configuration
 
diff --git a/docker-compose.yml b/docker-compose.yml
index cc97772..3dfb9f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
   php-fpm:
     build:
       args:
-        BASE_IMAGE: skpr/php-fpm:${PHP_VERSION:-8.3}-dev-v2-latest
+        BASE_IMAGE: skpr/php-fpm:${PHP_VERSION:-8.4}-dev-v2-latest
         USERNAME: ${USERNAME:-skpr}
         UID: ${UID:-1000}
         GID: ${GID:-1000}
@@ -32,7 +32,7 @@ services:
   php-cli:
     build:
       args:
-        BASE_IMAGE: skpr/php-cli:${PHP_VERSION:-8.3}-dev-v2-latest
+        BASE_IMAGE: skpr/php-cli:${PHP_VERSION:-8.4}-dev-v2-latest
         USERNAME: ${USERNAME:-skpr}
         UID: ${UID:-1000}
         GID: ${GID:-1000}