diff --git a/.github/workflows/build_php.yml b/.github/workflows/build_php.yml
index 7a5dc12..3a66570 100644
--- a/.github/workflows/build_php.yml
+++ b/.github/workflows/build_php.yml
@@ -16,6 +16,8 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
         php-target:
           - "cli"
           - "fpm"
diff --git a/.github/workflows/build_push_php.yml b/.github/workflows/build_push_php.yml
index 1f2f2e4..95eb817 100644
--- a/.github/workflows/build_push_php.yml
+++ b/.github/workflows/build_push_php.yml
@@ -20,6 +20,8 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
         php-target:
           - "cli"
           - "fpm"
diff --git a/php/README.md b/php/README.md
index 2bbbee8..4eacb6c 100644
--- a/php/README.md
+++ b/php/README.md
@@ -26,7 +26,7 @@ Extends the official PHP image with the following PHP extensions:
 
 See [prooph/proophessor-do app](https://github.com/prooph/proophessor-do) for an example.
 
-> Each image has tags for 7.4, 8.0, 8.1 and 8.2
+> Each image has tags for 7.4, 8.0, 8.1, 8.2, 8.3 and 8.4.
 
 There are also PHP ZTS versions.
 
@@ -110,6 +110,11 @@ To run Composer use:
 ```bash
 $ docker run --rm -it --volume $(pwd):/app prooph/composer:7.4 [your composer command]
 ```
+## Composer with PHP 8.4
+Use the following image: `prooph/composer:8.4`.
+
+## Composer with PHP 8.3
+Use the following image: `prooph/composer:8.3`.
 
 ## Composer with PHP 8.2
 Use the following image: `prooph/composer:8.2`.
diff --git a/php/m4/php-cli.m4 b/php/m4/php-cli.m4
index 2d1da2e..d4c60b7 100644
--- a/php/m4/php-cli.m4
+++ b/php/m4/php-cli.m4
@@ -1,8 +1,8 @@
 include(`macros.m4')
 DONT_CHANGE()
 
-ARG ALPINE_VERSION=3.16
-ARG PHP_VERSION=8.2
+ARG ALPINE_VERSION=3.20
+ARG PHP_VERSION=8.4
 
 ########
 # base #
diff --git a/php/m4/php-fpm.m4 b/php/m4/php-fpm.m4
index e84395b..6ff080f 100644
--- a/php/m4/php-fpm.m4
+++ b/php/m4/php-fpm.m4
@@ -1,8 +1,8 @@
 include(`macros.m4')
 DONT_CHANGE()
 
-ARG ALPINE_VERSION=3.16
-ARG PHP_VERSION=8.2
+ARG ALPINE_VERSION=3.20
+ARG PHP_VERSION=8.4
 
 ########
 # base #
diff --git a/php/m4/php-zts.m4 b/php/m4/php-zts.m4
index 2aac2a9..7cfe2e8 100644
--- a/php/m4/php-zts.m4
+++ b/php/m4/php-zts.m4
@@ -1,8 +1,8 @@
 include(`macros.m4')
 DONT_CHANGE()
 
-ARG ALPINE_VERSION=3.16
-ARG PHP_VERSION=8.2
+ARG ALPINE_VERSION=3.20
+ARG PHP_VERSION=8.4
 
 ########
 # base #
diff --git a/php/makefile b/php/makefile
index 5a4a00d..8197157 100644
--- a/php/makefile
+++ b/php/makefile
@@ -14,34 +14,53 @@ docker-build:
 	export PHP_VERSION=8.0; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose build
 	export PHP_VERSION=8.1; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose build
 	export PHP_VERSION=8.2; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose build
+	export PHP_VERSION=8.3; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose build
+	export PHP_VERSION=8.4; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose build
 
 	export PHP_VERSION=8.0; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose build
 	export PHP_VERSION=8.1; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose build
 	export PHP_VERSION=8.2; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose build
+	export PHP_VERSION=8.3; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose build
+	export PHP_VERSION=8.4; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose build
 
 	export PHP_VERSION=8.0; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose build
 	export PHP_VERSION=8.1; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose build
 	export PHP_VERSION=8.2; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose build
+	export PHP_VERSION=8.3; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose build
+	export PHP_VERSION=8.4; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose build
 
 docker-push:
 	export PHP_VERSION=8.0; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose push
 	export PHP_VERSION=8.1; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose push
 	export PHP_VERSION=8.2; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose push
+	export PHP_VERSION=8.3; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose push
+	export PHP_VERSION=8.4; export PHP_TARGET=cli; export DOCKER_REGISTRY=prooph/; docker-compose push
 
 	export PHP_VERSION=8.0; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose push
 	export PHP_VERSION=8.1; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose push
 	export PHP_VERSION=8.2; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose push
+	export PHP_VERSION=8.3; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose push
+	export PHP_VERSION=8.4; export PHP_TARGET=fpm; export DOCKER_REGISTRY=prooph/; docker-compose push
 
 	export PHP_VERSION=8.0; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose push
 	export PHP_VERSION=8.1; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose push
 	export PHP_VERSION=8.2; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose push
+	export PHP_VERSION=8.3; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose push
+	export PHP_VERSION=8.4; export PHP_TARGET=zts; export DOCKER_REGISTRY=prooph/; docker-compose push
 
 docker-pull:
 	docker pull php:8.0-cli-alpine3.16
 	docker pull php:8.1-cli-alpine3.16
+	docker pull php:8.2-cli-alpine3.16
+	docker pull php:8.3-cli-alpine3.16
+	docker pull php:8.4-cli-alpine3.20
 	docker pull php:8.0-fpm-alpine3.16
 	docker pull php:8.1-fpm-alpine3.16
 	docker pull php:8.2-fpm-alpine3.16
+	docker pull php:8.3-fpm-alpine3.16
+	docker pull php:8.4-fpm-alpine3.20
 	docker pull php:8.0-zts-alpine3.16
 	docker pull php:8.1-zts-alpine3.16
 	docker pull php:8.2-zts-alpine3.16
+	docker pull php:8.3-zts-alpine3.16
+	docker pull php:8.4-zts-alpine3.20
diff --git a/php/php-cli b/php/php-cli
index bc629b0..4a3341e 100644
--- a/php/php-cli
+++ b/php/php-cli
@@ -1,7 +1,7 @@
 # DO NOT MODIFY THIS AUTOGENERATED FILE
 # Change it in m4 folder
-ARG ALPINE_VERSION=3.16
-ARG PHP_VERSION=8.2
+ARG ALPINE_VERSION=3.20
+ARG PHP_VERSION=8.4
 ########
 # base #
 ########
diff --git a/php/php-fpm b/php/php-fpm
index 76dac73..9c8624f 100644
--- a/php/php-fpm
+++ b/php/php-fpm
@@ -1,7 +1,7 @@
 # DO NOT MODIFY THIS AUTOGENERATED FILE
 # Change it in m4 folder
-ARG ALPINE_VERSION=3.16
-ARG PHP_VERSION=8.2
+ARG ALPINE_VERSION=3.20
+ARG PHP_VERSION=8.4
 ########
 # base #
 ########
diff --git a/php/php-zts b/php/php-zts
index 19f52c9..c6e3c58 100644
--- a/php/php-zts
+++ b/php/php-zts
@@ -1,7 +1,7 @@
 # DO NOT MODIFY THIS AUTOGENERATED FILE
 # Change it in m4 folder
-ARG ALPINE_VERSION=3.16
-ARG PHP_VERSION=8.2
+ARG ALPINE_VERSION=3.20
+ARG PHP_VERSION=8.4
 ########
 # base #
 ########