diff --git a/Makefile b/Makefile
index bcfa914..a611cab 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,15 @@ test-latest: test-8.4 ## Test the latest build only
 _test-prerequisites: blueprint
 	docker pull ubuntu:20.04
 
+test-hot:  ## Test 7.4, 8.0 and 8.1 quickly
+	docker buildx bake --load \
+    		--set "*.platform=$(uname -p)" \
+    		php80-slim-cli php80-cli
+	docker run --rm -it docker.io/thecodingmachine/php:8.0-v5-cli php -v
+test-legacy-quick:  ## Test 7.4, 8.0 and 8.1 quickly
+	VERSION=7.4 VARIANT=cli $(MAKE) _test-version-quick
+	VERSION=8.0 VARIANT=cli $(MAKE) _test-version-quick
+	VERSION=8.1 VARIANT=cli $(MAKE) _test-version-quick
 test-quick:  ## Test 8.2, 8.3 and 8.4 quickly
 	VERSION=8.2 VARIANT=cli $(MAKE) _test-version-quick
 	VERSION=8.3 VARIANT=cli $(MAKE) _test-version-quick
diff --git a/README.md b/README.md
index d8ce995..e9f0958 100644
--- a/README.md
+++ b/README.md
@@ -23,62 +23,62 @@ This repository contains a set of developer-friendly, general purpose PHP images
 | Name                                                                    | PHP version                                                                                                                                        | type                                       |variant | NodeJS version  | Size 
 |-------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------|--------|-----------------|------
 | [thecodingmachine/php:8.4-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache)                      | `8.4.x` | fat  | apache   | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache)
-| [thecodingmachine/php:8.4-v5-apache-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.4.x` | fat  | apache   | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache-node18)
 | [thecodingmachine/php:8.4-v5-apache-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.4.x` | fat  | apache   | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache-node20)
 | [thecodingmachine/php:8.4-v5-apache-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.4.x` | fat  | apache   | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache-node22)
+| [thecodingmachine/php:8.4-v5-apache-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.4.x` | fat  | apache   | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-apache-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-apache-node24)
 | [thecodingmachine/php:8.4-v5-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm)                            | `8.4.x` | fat  | fpm      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-fpm)
-| [thecodingmachine/php:8.4-v5-fpm-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.4.x` | fat  | fpm      | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-fpm-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-fpm-node18)
 | [thecodingmachine/php:8.4-v5-fpm-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.4.x` | fat  | fpm      | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-fpm-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-fpm-node20)
 | [thecodingmachine/php:8.4-v5-fpm-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.4.x` | fat  | fpm      | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-fpm-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-fpm-node22)
+| [thecodingmachine/php:8.4-v5-fpm-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.4.x` | fat  | fpm      | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-fpm-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-fpm-node24)
 | [thecodingmachine/php:8.4-v5-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli)                            | `8.4.x` | fat  | cli      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-cli)
-| [thecodingmachine/php:8.4-v5-cli-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.4.x` | fat  | cli      | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-cli-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-cli-node18)
 | [thecodingmachine/php:8.4-v5-cli-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.4.x` | fat  | cli      | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-cli-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-cli-node20)
 | [thecodingmachine/php:8.4-v5-cli-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.4.x` | fat  | cli      | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-cli-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-cli-node22)
+| [thecodingmachine/php:8.4-v5-cli-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.4.x` | fat  | cli      | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-cli-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-cli-node24)
 | [thecodingmachine/php:8.4-v5-slim-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.apache)            | `8.4.x` | slim | apache   | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-slim-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-slim-apache)
 | [thecodingmachine/php:8.4-v5-slim-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.fpm)                                                                | `8.4.x`                                                                                                    | slim                                       | fpm      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-slim-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-slim-fpm)
 | [thecodingmachine/php:8.4-v5-slim-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.cli)                                                                | `8.4.x`                                                                                                    | slim                                       | cli      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.4-v5-slim-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.4-v5-slim-cli)
 | [thecodingmachine/php:8.3-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache)                      | `8.3.x` | fat  | apache   | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-apache)
-| [thecodingmachine/php:8.3-v5-apache-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.3.x` | fat  | apache   | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-apache-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-apache-node18)
 | [thecodingmachine/php:8.3-v5-apache-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.3.x` | fat  | apache   | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-apache-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-apache-node20)
 | [thecodingmachine/php:8.3-v5-apache-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.3.x` | fat  | apache   | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-apache-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-apache-node22)
+| [thecodingmachine/php:8.3-v5-apache-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.3.x` | fat  | apache   | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-apache-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-apache-node24)
 | [thecodingmachine/php:8.3-v5-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm)                            | `8.3.x` | fat  | fpm      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-fpm)
-| [thecodingmachine/php:8.3-v5-fpm-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.3.x` | fat  | fpm      | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-fpm-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-fpm-node18)
 | [thecodingmachine/php:8.3-v5-fpm-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.3.x` | fat  | fpm      | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-fpm-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-fpm-node20)
 | [thecodingmachine/php:8.3-v5-fpm-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.3.x` | fat  | fpm      | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-fpm-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-fpm-node22)
+| [thecodingmachine/php:8.3-v5-fpm-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.3.x` | fat  | fpm      | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-fpm-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-fpm-node24)
 | [thecodingmachine/php:8.3-v5-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli)                            | `8.3.x` | fat  | cli      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-cli)
-| [thecodingmachine/php:8.3-v5-cli-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.3.x` | fat  | cli      | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-cli-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-cli-node18)
 | [thecodingmachine/php:8.3-v5-cli-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.3.x` | fat  | cli      | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-cli-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-cli-node20)
 | [thecodingmachine/php:8.3-v5-cli-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.3.x` | fat  | cli      | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-cli-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-cli-node22)
+| [thecodingmachine/php:8.3-v5-cli-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.3.x` | fat  | cli      | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-cli-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-cli-node24)
 | [thecodingmachine/php:8.3-v5-slim-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.apache)            | `8.3.x` | slim | apache   | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-slim-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-slim-apache)
 | [thecodingmachine/php:8.3-v5-slim-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.fpm)                                                                | `8.3.x`                                                                                                    | slim                                       | fpm      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-slim-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-slim-fpm)
 | [thecodingmachine/php:8.3-v5-slim-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.cli)                                                                | `8.3.x`                                                                                                    | slim                                       | cli      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.3-v5-slim-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.3-v5-slim-cli)
 | [thecodingmachine/php:8.2-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache)                      | `8.2.x` | fat  | apache   | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-apache)
-| [thecodingmachine/php:8.2-v5-apache-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.2.x` | fat  | apache   | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-apache-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-apache-node18)
 | [thecodingmachine/php:8.2-v5-apache-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.2.x` | fat  | apache   | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-apache-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-apache-node20)
 | [thecodingmachine/php:8.2-v5-apache-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.2.x` | fat  | apache   | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-apache-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-apache-node22)
+| [thecodingmachine/php:8.2-v5-apache-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.2.x` | fat  | apache   | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-apache-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-apache-node24)
 | [thecodingmachine/php:8.2-v5-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm)                            | `8.2.x` | fat  | fpm      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-fpm)
-| [thecodingmachine/php:8.2-v5-fpm-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.2.x` | fat  | fpm      | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-fpm-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-fpm-node18)
 | [thecodingmachine/php:8.2-v5-fpm-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.2.x` | fat  | fpm      | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-fpm-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-fpm-node20)
 | [thecodingmachine/php:8.2-v5-fpm-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.2.x` | fat  | fpm      | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-fpm-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-fpm-node22)
+| [thecodingmachine/php:8.2-v5-fpm-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.2.x` | fat  | fpm      | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-fpm-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-fpm-node24)
 | [thecodingmachine/php:8.2-v5-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli)                            | `8.2.x` | fat  | cli      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-cli)
-| [thecodingmachine/php:8.2-v5-cli-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.2.x` | fat  | cli      | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-cli-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-cli-node18)
 | [thecodingmachine/php:8.2-v5-cli-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.2.x` | fat  | cli      | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-cli-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-cli-node20)
 | [thecodingmachine/php:8.2-v5-cli-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.2.x` | fat  | cli      | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-cli-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-cli-node22)
+| [thecodingmachine/php:8.2-v5-cli-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.2.x` | fat  | cli      | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-cli-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-cli-node24)
 | [thecodingmachine/php:8.2-v5-slim-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.apache)            | `8.2.x` | slim | apache   | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-slim-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-slim-apache)
 | [thecodingmachine/php:8.2-v5-slim-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.fpm)                                                                | `8.2.x`                                                                                                    | slim                                       | fpm      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-slim-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-slim-fpm)
 | [thecodingmachine/php:8.2-v5-slim-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.cli)                                                                | `8.2.x`                                                                                                    | slim                                       | cli      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.2-v5-slim-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.2-v5-slim-cli)
 | [thecodingmachine/php:8.1-v5-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache)                      | `8.1.x` | fat  | apache   | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-apache)
-| [thecodingmachine/php:8.1-v5-apache-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.1.x` | fat  | apache   | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-apache-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-apache-node18)
 | [thecodingmachine/php:8.1-v5-apache-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.1.x` | fat  | apache   | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-apache-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-apache-node20)
 | [thecodingmachine/php:8.1-v5-apache-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.1.x` | fat  | apache   | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-apache-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-apache-node22)
+| [thecodingmachine/php:8.1-v5-apache-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.apache.node) | `8.1.x` | fat  | apache   | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-apache-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-apache-node24)
 | [thecodingmachine/php:8.1-v5-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm)                            | `8.1.x` | fat  | fpm      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-fpm)
-| [thecodingmachine/php:8.1-v5-fpm-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.1.x` | fat  | fpm      | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-fpm-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-fpm-node18)
 | [thecodingmachine/php:8.1-v5-fpm-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.1.x` | fat  | fpm      | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-fpm-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-fpm-node20)
 | [thecodingmachine/php:8.1-v5-fpm-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.1.x` | fat  | fpm      | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-fpm-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-fpm-node22)
+| [thecodingmachine/php:8.1-v5-fpm-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.fpm.node)      | `8.1.x` | fat  | fpm      | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-fpm-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-fpm-node24)
 | [thecodingmachine/php:8.1-v5-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli)                            | `8.1.x` | fat  | cli      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-cli)
-| [thecodingmachine/php:8.1-v5-cli-node18](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.1.x` | fat  | cli      | `18.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-cli-node18.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-cli-node18)
 | [thecodingmachine/php:8.1-v5-cli-node20](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.1.x` | fat  | cli      | `20.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-cli-node20.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-cli-node20)
 | [thecodingmachine/php:8.1-v5-cli-node22](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.1.x` | fat  | cli      | `22.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-cli-node22.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-cli-node22)
+| [thecodingmachine/php:8.1-v5-cli-node24](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.cli.node)      | `8.1.x` | fat  | cli      | `24.x`  | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-cli-node24.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-cli-node24)
 | [thecodingmachine/php:8.1-v5-slim-apache](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.apache)            | `8.1.x` | slim | apache   | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-slim-apache.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-slim-apache)
 | [thecodingmachine/php:8.1-v5-slim-fpm](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.fpm)                                                                | `8.1.x`                                                                                                    | slim                                       | fpm      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-slim-fpm.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-slim-fpm)
 | [thecodingmachine/php:8.1-v5-slim-cli](https://github.com/thecodingmachine/docker-images-php/blob/v5/Dockerfile.slim.cli)                                                                | `8.1.x`                                                                                                    | slim                                       | cli      | *N/A*                                                | [![](https://images.microbadger.com/badges/image/thecodingmachine/php:8.1-v5-slim-cli.svg)](https://microbadger.com/images/thecodingmachine/php:8.1-v5-slim-cli)
@@ -114,11 +114,11 @@ Example with PHP-FPM:
 $ docker run -p 9000:9000 --rm --name my-php-fpm -v "$PWD":/var/www/html thecodingmachine/php:8.4-v5-fpm
 ```
 
-Example with Apache + Node 22.x in a Dockerfile:
+Example with Apache + Node 24.x in a Dockerfile:
 
 **Dockerfile**
 ```Dockerfile
-FROM thecodingmachine/php:8.4-v5-apache-node22
+FROM thecodingmachine/php:8.4-v5-apache-node24
 
 COPY src/ /var/www/html/
 RUN composer install
@@ -164,7 +164,7 @@ For instance:
 version: '3'
 services:
   my_app:
-    image: thecodingmachine/php:8.4-v5-apache-node22
+    image: thecodingmachine/php:8.4-v5-apache-node24
     environment:
       # Enable the PostgreSQL extension
       PHP_EXTENSION_PGSQL: 1
@@ -200,7 +200,7 @@ first FROM):
 # The PHP_EXTENSIONS ARG will apply to the "slim" image
 ARG PHP_EXTENSIONS="apcu mysqli pdo_mysql soap"
 
-FROM thecodingmachine/php:8.4-v5-apache-node22 AS builder
+FROM thecodingmachine/php:8.4-v5-apache-node24 AS builder
 
 COPY --chown=docker:docker sources/web .
 RUN composer install &&\
@@ -236,7 +236,7 @@ You can override parameters in `php.ini` using the PHP_INI_XXX environment varia
 version: '3'
 services:
   my_app:
-    image: thecodingmachine/php:8.4-v5-apache-node22
+    image: thecodingmachine/php:8.4-v5-apache-node24
     environment:
       # set the parameter memory_limit=1g
       PHP_INI_MEMORY_LIMIT: 1g
@@ -298,7 +298,7 @@ For instance:
 version: '3'
 services:
   my_app:
-    image: thecodingmachine/php:8.4-v5-apache-node22
+    image: thecodingmachine/php:8.4-v5-apache-node24
     environment:
       # Enable the DAV extension for Apache
       APACHE_EXTENSION_DAV: 1
@@ -345,7 +345,7 @@ In that case the manually set value takes precedence over the mentioned ones abo
 
 ## NodeJS
 
-The *fat* images come with a Node variant. You can use Node : 18 20 22. If you need a previous variant, [use thecodingmachine/php v4 images](https://github.com/thecodingmachine/docker-images-php/tree/v4), [php v3 images](https://github.com/thecodingmachine/docker-images-php/tree/v3) or [v1](https://github.com/thecodingmachine/docker-images-php/tree/7.2-v1).
+The *fat* images come with a Node variant. You can use Node : 20 22 24. If you need a previous variant, [use thecodingmachine/php v4 images](https://github.com/thecodingmachine/docker-images-php/tree/v4), [php v3 images](https://github.com/thecodingmachine/docker-images-php/tree/v3) or [v1](https://github.com/thecodingmachine/docker-images-php/tree/7.2-v1).
 
 If you use the *slim* images, you can install a NodeJS version with a simple ARG during the build:
 
@@ -546,7 +546,7 @@ This option is the easiest way to go if you are using the image on a development
 version: '3'
 services:
   my_app:
-    image: thecodingmachine/php:8.4-v5-apache-node22
+    image: thecodingmachine/php:8.4-v5-apache-node24
     volumes:
       - ~/.ssh:/home/docker/.ssh
 ```
diff --git a/docker-bake.hcl b/docker-bake.hcl
index d8775c0..ed52f3f 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -16,126 +16,126 @@ group "php84-apache-all" {
    targets = [
      "php84-slim-apache",
      "php84-apache",
-     "php84-apache-node22","php84-apache-node20","php84-apache-node18",
+     "php84-apache-node24","php84-apache-node22","php84-apache-node20",
    ]
 }
 group "php84-fpm-all" {
    targets = [
      "php84-slim-fpm",
      "php84-fpm",
-     "php84-fpm-node22","php84-fpm-node20","php84-fpm-node18",
+     "php84-fpm-node24","php84-fpm-node22","php84-fpm-node20",
    ]
 }
 group "php84-cli-all" {
    targets = [
      "php84-slim-cli",
      "php84-cli",
-     "php84-cli-node22","php84-cli-node20","php84-cli-node18",
+     "php84-cli-node24","php84-cli-node22","php84-cli-node20",
    ]
 }
 group "php83-apache-all" {
    targets = [
      "php83-slim-apache",
      "php83-apache",
-     "php83-apache-node22","php83-apache-node20","php83-apache-node18",
+     "php83-apache-node24","php83-apache-node22","php83-apache-node20",
    ]
 }
 group "php83-fpm-all" {
    targets = [
      "php83-slim-fpm",
      "php83-fpm",
-     "php83-fpm-node22","php83-fpm-node20","php83-fpm-node18",
+     "php83-fpm-node24","php83-fpm-node22","php83-fpm-node20",
    ]
 }
 group "php83-cli-all" {
    targets = [
      "php83-slim-cli",
      "php83-cli",
-     "php83-cli-node22","php83-cli-node20","php83-cli-node18",
+     "php83-cli-node24","php83-cli-node22","php83-cli-node20",
    ]
 }
 group "php82-apache-all" {
    targets = [
      "php82-slim-apache",
      "php82-apache",
-     "php82-apache-node22","php82-apache-node20","php82-apache-node18",
+     "php82-apache-node24","php82-apache-node22","php82-apache-node20",
    ]
 }
 group "php82-fpm-all" {
    targets = [
      "php82-slim-fpm",
      "php82-fpm",
-     "php82-fpm-node22","php82-fpm-node20","php82-fpm-node18",
+     "php82-fpm-node24","php82-fpm-node22","php82-fpm-node20",
    ]
 }
 group "php82-cli-all" {
    targets = [
      "php82-slim-cli",
      "php82-cli",
-     "php82-cli-node22","php82-cli-node20","php82-cli-node18",
+     "php82-cli-node24","php82-cli-node22","php82-cli-node20",
    ]
 }
 group "php81-apache-all" {
    targets = [
      "php81-slim-apache",
      "php81-apache",
-     "php81-apache-node22","php81-apache-node20","php81-apache-node18",
+     "php81-apache-node24","php81-apache-node22","php81-apache-node20",
    ]
 }
 group "php81-fpm-all" {
    targets = [
      "php81-slim-fpm",
      "php81-fpm",
-     "php81-fpm-node22","php81-fpm-node20","php81-fpm-node18",
+     "php81-fpm-node24","php81-fpm-node22","php81-fpm-node20",
    ]
 }
 group "php81-cli-all" {
    targets = [
      "php81-slim-cli",
      "php81-cli",
-     "php81-cli-node22","php81-cli-node20","php81-cli-node18",
+     "php81-cli-node24","php81-cli-node22","php81-cli-node20",
    ]
 }
 group "php80-apache-all" {
    targets = [
      "php80-slim-apache",
      "php80-apache",
-     "php80-apache-node22","php80-apache-node20","php80-apache-node18",
+     "php80-apache-node24","php80-apache-node22","php80-apache-node20",
    ]
 }
 group "php80-fpm-all" {
    targets = [
      "php80-slim-fpm",
      "php80-fpm",
-     "php80-fpm-node22","php80-fpm-node20","php80-fpm-node18",
+     "php80-fpm-node24","php80-fpm-node22","php80-fpm-node20",
    ]
 }
 group "php80-cli-all" {
    targets = [
      "php80-slim-cli",
      "php80-cli",
-     "php80-cli-node22","php80-cli-node20","php80-cli-node18",
+     "php80-cli-node24","php80-cli-node22","php80-cli-node20",
    ]
 }
 group "php74-apache-all" {
    targets = [
      "php74-slim-apache",
      "php74-apache",
-     "php74-apache-node22","php74-apache-node20","php74-apache-node18",
+     "php74-apache-node24","php74-apache-node22","php74-apache-node20",
    ]
 }
 group "php74-fpm-all" {
    targets = [
      "php74-slim-fpm",
      "php74-fpm",
-     "php74-fpm-node22","php74-fpm-node20","php74-fpm-node18",
+     "php74-fpm-node24","php74-fpm-node22","php74-fpm-node20",
    ]
 }
 group "php74-cli-all" {
    targets = [
      "php74-slim-cli",
      "php74-cli",
-     "php74-cli-node22","php74-cli-node20","php74-cli-node18",
+     "php74-cli-node24","php74-cli-node22","php74-cli-node20",
    ]
 }
 
@@ -215,48 +215,48 @@ target "php84-apache" {
   }
 }
 
-# thecodingmachine/php:8.4-v5-apache-node22
-target "php84-apache-node22" {
+# thecodingmachine/php:8.4-v5-apache-node24
+target "php84-apache-node24" {
   inherits = ["default"]
-  tags = tag("8.4", "apache-node22")
+  tags = tag("8.4", "apache-node24")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.4"
-    VARIANT = "apache-node22"
+    VARIANT = "apache-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php84-apache"
   }
 }
 
-# thecodingmachine/php:8.4-v5-apache-node20
-target "php84-apache-node20" {
+# thecodingmachine/php:8.4-v5-apache-node22
+target "php84-apache-node22" {
   inherits = ["default"]
-  tags = tag("8.4", "apache-node20")
+  tags = tag("8.4", "apache-node22")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.4"
-    VARIANT = "apache-node20"
+    VARIANT = "apache-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php84-apache"
   }
 }
 
-# thecodingmachine/php:8.4-v5-apache-node18
-target "php84-apache-node18" {
+# thecodingmachine/php:8.4-v5-apache-node20
+target "php84-apache-node20" {
   inherits = ["default"]
-  tags = tag("8.4", "apache-node18")
+  tags = tag("8.4", "apache-node20")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.4"
-    VARIANT = "apache-node18"
+    VARIANT = "apache-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php84-apache"
@@ -292,48 +292,48 @@ target "php84-fpm" {
   }
 }
 
-# thecodingmachine/php:8.4-v5-fpm-node22
-target "php84-fpm-node22" {
+# thecodingmachine/php:8.4-v5-fpm-node24
+target "php84-fpm-node24" {
   inherits = ["default"]
-  tags = tag("8.4", "fpm-node22")
+  tags = tag("8.4", "fpm-node24")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.4"
-    VARIANT = "fpm-node22"
+    VARIANT = "fpm-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php84-fpm"
   }
 }
 
-# thecodingmachine/php:8.4-v5-fpm-node20
-target "php84-fpm-node20" {
+# thecodingmachine/php:8.4-v5-fpm-node22
+target "php84-fpm-node22" {
   inherits = ["default"]
-  tags = tag("8.4", "fpm-node20")
+  tags = tag("8.4", "fpm-node22")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.4"
-    VARIANT = "fpm-node20"
+    VARIANT = "fpm-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php84-fpm"
   }
 }
 
-# thecodingmachine/php:8.4-v5-fpm-node18
-target "php84-fpm-node18" {
+# thecodingmachine/php:8.4-v5-fpm-node20
+target "php84-fpm-node20" {
   inherits = ["default"]
-  tags = tag("8.4", "fpm-node18")
+  tags = tag("8.4", "fpm-node20")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.4"
-    VARIANT = "fpm-node18"
+    VARIANT = "fpm-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php84-fpm"
@@ -369,48 +369,48 @@ target "php84-cli" {
   }
 }
 
-# thecodingmachine/php:8.4-v5-cli-node22
-target "php84-cli-node22" {
+# thecodingmachine/php:8.4-v5-cli-node24
+target "php84-cli-node24" {
   inherits = ["default"]
-  tags = tag("8.4", "cli-node22")
+  tags = tag("8.4", "cli-node24")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.4"
-    VARIANT = "cli-node22"
+    VARIANT = "cli-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php84-cli"
   }
 }
 
-# thecodingmachine/php:8.4-v5-cli-node20
-target "php84-cli-node20" {
+# thecodingmachine/php:8.4-v5-cli-node22
+target "php84-cli-node22" {
   inherits = ["default"]
-  tags = tag("8.4", "cli-node20")
+  tags = tag("8.4", "cli-node22")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.4"
-    VARIANT = "cli-node20"
+    VARIANT = "cli-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php84-cli"
   }
 }
 
-# thecodingmachine/php:8.4-v5-cli-node18
-target "php84-cli-node18" {
+# thecodingmachine/php:8.4-v5-cli-node20
+target "php84-cli-node20" {
   inherits = ["default"]
-  tags = tag("8.4", "cli-node18")
+  tags = tag("8.4", "cli-node20")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.4"
-    VARIANT = "cli-node18"
+    VARIANT = "cli-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php84-cli"
@@ -446,48 +446,48 @@ target "php83-apache" {
   }
 }
 
-# thecodingmachine/php:8.3-v5-apache-node22
-target "php83-apache-node22" {
+# thecodingmachine/php:8.3-v5-apache-node24
+target "php83-apache-node24" {
   inherits = ["default"]
-  tags = tag("8.3", "apache-node22")
+  tags = tag("8.3", "apache-node24")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.3"
-    VARIANT = "apache-node22"
+    VARIANT = "apache-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php83-apache"
   }
 }
 
-# thecodingmachine/php:8.3-v5-apache-node20
-target "php83-apache-node20" {
+# thecodingmachine/php:8.3-v5-apache-node22
+target "php83-apache-node22" {
   inherits = ["default"]
-  tags = tag("8.3", "apache-node20")
+  tags = tag("8.3", "apache-node22")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.3"
-    VARIANT = "apache-node20"
+    VARIANT = "apache-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php83-apache"
   }
 }
 
-# thecodingmachine/php:8.3-v5-apache-node18
-target "php83-apache-node18" {
+# thecodingmachine/php:8.3-v5-apache-node20
+target "php83-apache-node20" {
   inherits = ["default"]
-  tags = tag("8.3", "apache-node18")
+  tags = tag("8.3", "apache-node20")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.3"
-    VARIANT = "apache-node18"
+    VARIANT = "apache-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php83-apache"
@@ -523,48 +523,48 @@ target "php83-fpm" {
   }
 }
 
-# thecodingmachine/php:8.3-v5-fpm-node22
-target "php83-fpm-node22" {
+# thecodingmachine/php:8.3-v5-fpm-node24
+target "php83-fpm-node24" {
   inherits = ["default"]
-  tags = tag("8.3", "fpm-node22")
+  tags = tag("8.3", "fpm-node24")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.3"
-    VARIANT = "fpm-node22"
+    VARIANT = "fpm-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php83-fpm"
   }
 }
 
-# thecodingmachine/php:8.3-v5-fpm-node20
-target "php83-fpm-node20" {
+# thecodingmachine/php:8.3-v5-fpm-node22
+target "php83-fpm-node22" {
   inherits = ["default"]
-  tags = tag("8.3", "fpm-node20")
+  tags = tag("8.3", "fpm-node22")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.3"
-    VARIANT = "fpm-node20"
+    VARIANT = "fpm-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php83-fpm"
   }
 }
 
-# thecodingmachine/php:8.3-v5-fpm-node18
-target "php83-fpm-node18" {
+# thecodingmachine/php:8.3-v5-fpm-node20
+target "php83-fpm-node20" {
   inherits = ["default"]
-  tags = tag("8.3", "fpm-node18")
+  tags = tag("8.3", "fpm-node20")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.3"
-    VARIANT = "fpm-node18"
+    VARIANT = "fpm-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php83-fpm"
@@ -600,48 +600,48 @@ target "php83-cli" {
   }
 }
 
-# thecodingmachine/php:8.3-v5-cli-node22
-target "php83-cli-node22" {
+# thecodingmachine/php:8.3-v5-cli-node24
+target "php83-cli-node24" {
   inherits = ["default"]
-  tags = tag("8.3", "cli-node22")
+  tags = tag("8.3", "cli-node24")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.3"
-    VARIANT = "cli-node22"
+    VARIANT = "cli-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php83-cli"
   }
 }
 
-# thecodingmachine/php:8.3-v5-cli-node20
-target "php83-cli-node20" {
+# thecodingmachine/php:8.3-v5-cli-node22
+target "php83-cli-node22" {
   inherits = ["default"]
-  tags = tag("8.3", "cli-node20")
+  tags = tag("8.3", "cli-node22")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.3"
-    VARIANT = "cli-node20"
+    VARIANT = "cli-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php83-cli"
   }
 }
 
-# thecodingmachine/php:8.3-v5-cli-node18
-target "php83-cli-node18" {
+# thecodingmachine/php:8.3-v5-cli-node20
+target "php83-cli-node20" {
   inherits = ["default"]
-  tags = tag("8.3", "cli-node18")
+  tags = tag("8.3", "cli-node20")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.3"
-    VARIANT = "cli-node18"
+    VARIANT = "cli-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php83-cli"
@@ -677,48 +677,48 @@ target "php82-apache" {
   }
 }
 
-# thecodingmachine/php:8.2-v5-apache-node22
-target "php82-apache-node22" {
+# thecodingmachine/php:8.2-v5-apache-node24
+target "php82-apache-node24" {
   inherits = ["default"]
-  tags = tag("8.2", "apache-node22")
+  tags = tag("8.2", "apache-node24")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.2"
-    VARIANT = "apache-node22"
+    VARIANT = "apache-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php82-apache"
   }
 }
 
-# thecodingmachine/php:8.2-v5-apache-node20
-target "php82-apache-node20" {
+# thecodingmachine/php:8.2-v5-apache-node22
+target "php82-apache-node22" {
   inherits = ["default"]
-  tags = tag("8.2", "apache-node20")
+  tags = tag("8.2", "apache-node22")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.2"
-    VARIANT = "apache-node20"
+    VARIANT = "apache-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php82-apache"
   }
 }
 
-# thecodingmachine/php:8.2-v5-apache-node18
-target "php82-apache-node18" {
+# thecodingmachine/php:8.2-v5-apache-node20
+target "php82-apache-node20" {
   inherits = ["default"]
-  tags = tag("8.2", "apache-node18")
+  tags = tag("8.2", "apache-node20")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.2"
-    VARIANT = "apache-node18"
+    VARIANT = "apache-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php82-apache"
@@ -754,48 +754,48 @@ target "php82-fpm" {
   }
 }
 
-# thecodingmachine/php:8.2-v5-fpm-node22
-target "php82-fpm-node22" {
+# thecodingmachine/php:8.2-v5-fpm-node24
+target "php82-fpm-node24" {
   inherits = ["default"]
-  tags = tag("8.2", "fpm-node22")
+  tags = tag("8.2", "fpm-node24")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.2"
-    VARIANT = "fpm-node22"
+    VARIANT = "fpm-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php82-fpm"
   }
 }
 
-# thecodingmachine/php:8.2-v5-fpm-node20
-target "php82-fpm-node20" {
+# thecodingmachine/php:8.2-v5-fpm-node22
+target "php82-fpm-node22" {
   inherits = ["default"]
-  tags = tag("8.2", "fpm-node20")
+  tags = tag("8.2", "fpm-node22")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.2"
-    VARIANT = "fpm-node20"
+    VARIANT = "fpm-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php82-fpm"
   }
 }
 
-# thecodingmachine/php:8.2-v5-fpm-node18
-target "php82-fpm-node18" {
+# thecodingmachine/php:8.2-v5-fpm-node20
+target "php82-fpm-node20" {
   inherits = ["default"]
-  tags = tag("8.2", "fpm-node18")
+  tags = tag("8.2", "fpm-node20")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.2"
-    VARIANT = "fpm-node18"
+    VARIANT = "fpm-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php82-fpm"
@@ -831,48 +831,48 @@ target "php82-cli" {
   }
 }
 
-# thecodingmachine/php:8.2-v5-cli-node22
-target "php82-cli-node22" {
+# thecodingmachine/php:8.2-v5-cli-node24
+target "php82-cli-node24" {
   inherits = ["default"]
-  tags = tag("8.2", "cli-node22")
+  tags = tag("8.2", "cli-node24")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.2"
-    VARIANT = "cli-node22"
+    VARIANT = "cli-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php82-cli"
   }
 }
 
-# thecodingmachine/php:8.2-v5-cli-node20
-target "php82-cli-node20" {
+# thecodingmachine/php:8.2-v5-cli-node22
+target "php82-cli-node22" {
   inherits = ["default"]
-  tags = tag("8.2", "cli-node20")
+  tags = tag("8.2", "cli-node22")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.2"
-    VARIANT = "cli-node20"
+    VARIANT = "cli-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php82-cli"
   }
 }
 
-# thecodingmachine/php:8.2-v5-cli-node18
-target "php82-cli-node18" {
+# thecodingmachine/php:8.2-v5-cli-node20
+target "php82-cli-node20" {
   inherits = ["default"]
-  tags = tag("8.2", "cli-node18")
+  tags = tag("8.2", "cli-node20")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.2"
-    VARIANT = "cli-node18"
+    VARIANT = "cli-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php82-cli"
@@ -908,48 +908,48 @@ target "php81-apache" {
   }
 }
 
-# thecodingmachine/php:8.1-v5-apache-node22
-target "php81-apache-node22" {
+# thecodingmachine/php:8.1-v5-apache-node24
+target "php81-apache-node24" {
   inherits = ["default"]
-  tags = tag("8.1", "apache-node22")
+  tags = tag("8.1", "apache-node24")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.1"
-    VARIANT = "apache-node22"
+    VARIANT = "apache-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php81-apache"
   }
 }
 
-# thecodingmachine/php:8.1-v5-apache-node20
-target "php81-apache-node20" {
+# thecodingmachine/php:8.1-v5-apache-node22
+target "php81-apache-node22" {
   inherits = ["default"]
-  tags = tag("8.1", "apache-node20")
+  tags = tag("8.1", "apache-node22")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.1"
-    VARIANT = "apache-node20"
+    VARIANT = "apache-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php81-apache"
   }
 }
 
-# thecodingmachine/php:8.1-v5-apache-node18
-target "php81-apache-node18" {
+# thecodingmachine/php:8.1-v5-apache-node20
+target "php81-apache-node20" {
   inherits = ["default"]
-  tags = tag("8.1", "apache-node18")
+  tags = tag("8.1", "apache-node20")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.1"
-    VARIANT = "apache-node18"
+    VARIANT = "apache-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php81-apache"
@@ -985,48 +985,48 @@ target "php81-fpm" {
   }
 }
 
-# thecodingmachine/php:8.1-v5-fpm-node22
-target "php81-fpm-node22" {
+# thecodingmachine/php:8.1-v5-fpm-node24
+target "php81-fpm-node24" {
   inherits = ["default"]
-  tags = tag("8.1", "fpm-node22")
+  tags = tag("8.1", "fpm-node24")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.1"
-    VARIANT = "fpm-node22"
+    VARIANT = "fpm-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php81-fpm"
   }
 }
 
-# thecodingmachine/php:8.1-v5-fpm-node20
-target "php81-fpm-node20" {
+# thecodingmachine/php:8.1-v5-fpm-node22
+target "php81-fpm-node22" {
   inherits = ["default"]
-  tags = tag("8.1", "fpm-node20")
+  tags = tag("8.1", "fpm-node22")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.1"
-    VARIANT = "fpm-node20"
+    VARIANT = "fpm-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php81-fpm"
   }
 }
 
-# thecodingmachine/php:8.1-v5-fpm-node18
-target "php81-fpm-node18" {
+# thecodingmachine/php:8.1-v5-fpm-node20
+target "php81-fpm-node20" {
   inherits = ["default"]
-  tags = tag("8.1", "fpm-node18")
+  tags = tag("8.1", "fpm-node20")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.1"
-    VARIANT = "fpm-node18"
+    VARIANT = "fpm-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php81-fpm"
@@ -1062,48 +1062,48 @@ target "php81-cli" {
   }
 }
 
-# thecodingmachine/php:8.1-v5-cli-node22
-target "php81-cli-node22" {
+# thecodingmachine/php:8.1-v5-cli-node24
+target "php81-cli-node24" {
   inherits = ["default"]
-  tags = tag("8.1", "cli-node22")
+  tags = tag("8.1", "cli-node24")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.1"
-    VARIANT = "cli-node22"
+    VARIANT = "cli-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php81-cli"
   }
 }
 
-# thecodingmachine/php:8.1-v5-cli-node20
-target "php81-cli-node20" {
+# thecodingmachine/php:8.1-v5-cli-node22
+target "php81-cli-node22" {
   inherits = ["default"]
-  tags = tag("8.1", "cli-node20")
+  tags = tag("8.1", "cli-node22")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.1"
-    VARIANT = "cli-node20"
+    VARIANT = "cli-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php81-cli"
   }
 }
 
-# thecodingmachine/php:8.1-v5-cli-node18
-target "php81-cli-node18" {
+# thecodingmachine/php:8.1-v5-cli-node20
+target "php81-cli-node20" {
   inherits = ["default"]
-  tags = tag("8.1", "cli-node18")
+  tags = tag("8.1", "cli-node20")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.1"
-    VARIANT = "cli-node18"
+    VARIANT = "cli-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php81-cli"
@@ -1139,48 +1139,48 @@ target "php80-apache" {
   }
 }
 
-# thecodingmachine/php:8.0-v5-apache-node22
-target "php80-apache-node22" {
+# thecodingmachine/php:8.0-v5-apache-node24
+target "php80-apache-node24" {
   inherits = ["default"]
-  tags = tag("8.0", "apache-node22")
+  tags = tag("8.0", "apache-node24")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.0"
-    VARIANT = "apache-node22"
+    VARIANT = "apache-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php80-apache"
   }
 }
 
-# thecodingmachine/php:8.0-v5-apache-node20
-target "php80-apache-node20" {
+# thecodingmachine/php:8.0-v5-apache-node22
+target "php80-apache-node22" {
   inherits = ["default"]
-  tags = tag("8.0", "apache-node20")
+  tags = tag("8.0", "apache-node22")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.0"
-    VARIANT = "apache-node20"
+    VARIANT = "apache-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php80-apache"
   }
 }
 
-# thecodingmachine/php:8.0-v5-apache-node18
-target "php80-apache-node18" {
+# thecodingmachine/php:8.0-v5-apache-node20
+target "php80-apache-node20" {
   inherits = ["default"]
-  tags = tag("8.0", "apache-node18")
+  tags = tag("8.0", "apache-node20")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "8.0"
-    VARIANT = "apache-node18"
+    VARIANT = "apache-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php80-apache"
@@ -1216,48 +1216,48 @@ target "php80-fpm" {
   }
 }
 
-# thecodingmachine/php:8.0-v5-fpm-node22
-target "php80-fpm-node22" {
+# thecodingmachine/php:8.0-v5-fpm-node24
+target "php80-fpm-node24" {
   inherits = ["default"]
-  tags = tag("8.0", "fpm-node22")
+  tags = tag("8.0", "fpm-node24")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.0"
-    VARIANT = "fpm-node22"
+    VARIANT = "fpm-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php80-fpm"
   }
 }
 
-# thecodingmachine/php:8.0-v5-fpm-node20
-target "php80-fpm-node20" {
+# thecodingmachine/php:8.0-v5-fpm-node22
+target "php80-fpm-node22" {
   inherits = ["default"]
-  tags = tag("8.0", "fpm-node20")
+  tags = tag("8.0", "fpm-node22")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.0"
-    VARIANT = "fpm-node20"
+    VARIANT = "fpm-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php80-fpm"
   }
 }
 
-# thecodingmachine/php:8.0-v5-fpm-node18
-target "php80-fpm-node18" {
+# thecodingmachine/php:8.0-v5-fpm-node20
+target "php80-fpm-node20" {
   inherits = ["default"]
-  tags = tag("8.0", "fpm-node18")
+  tags = tag("8.0", "fpm-node20")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "8.0"
-    VARIANT = "fpm-node18"
+    VARIANT = "fpm-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php80-fpm"
@@ -1293,48 +1293,48 @@ target "php80-cli" {
   }
 }
 
-# thecodingmachine/php:8.0-v5-cli-node22
-target "php80-cli-node22" {
+# thecodingmachine/php:8.0-v5-cli-node24
+target "php80-cli-node24" {
   inherits = ["default"]
-  tags = tag("8.0", "cli-node22")
+  tags = tag("8.0", "cli-node24")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.0"
-    VARIANT = "cli-node22"
+    VARIANT = "cli-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php80-cli"
   }
 }
 
-# thecodingmachine/php:8.0-v5-cli-node20
-target "php80-cli-node20" {
+# thecodingmachine/php:8.0-v5-cli-node22
+target "php80-cli-node22" {
   inherits = ["default"]
-  tags = tag("8.0", "cli-node20")
+  tags = tag("8.0", "cli-node22")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.0"
-    VARIANT = "cli-node20"
+    VARIANT = "cli-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php80-cli"
   }
 }
 
-# thecodingmachine/php:8.0-v5-cli-node18
-target "php80-cli-node18" {
+# thecodingmachine/php:8.0-v5-cli-node20
+target "php80-cli-node20" {
   inherits = ["default"]
-  tags = tag("8.0", "cli-node18")
+  tags = tag("8.0", "cli-node20")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "8.0"
-    VARIANT = "cli-node18"
+    VARIANT = "cli-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php80-cli"
@@ -1370,48 +1370,48 @@ target "php74-apache" {
   }
 }
 
-# thecodingmachine/php:7.4-v5-apache-node22
-target "php74-apache-node22" {
+# thecodingmachine/php:7.4-v5-apache-node24
+target "php74-apache-node24" {
   inherits = ["default"]
-  tags = tag("7.4", "apache-node22")
+  tags = tag("7.4", "apache-node24")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "7.4"
-    VARIANT = "apache-node22"
+    VARIANT = "apache-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php74-apache"
   }
 }
 
-# thecodingmachine/php:7.4-v5-apache-node20
-target "php74-apache-node20" {
+# thecodingmachine/php:7.4-v5-apache-node22
+target "php74-apache-node22" {
   inherits = ["default"]
-  tags = tag("7.4", "apache-node20")
+  tags = tag("7.4", "apache-node22")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "7.4"
-    VARIANT = "apache-node20"
+    VARIANT = "apache-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php74-apache"
   }
 }
 
-# thecodingmachine/php:7.4-v5-apache-node18
-target "php74-apache-node18" {
+# thecodingmachine/php:7.4-v5-apache-node20
+target "php74-apache-node20" {
   inherits = ["default"]
-  tags = tag("7.4", "apache-node18")
+  tags = tag("7.4", "apache-node20")
   dockerfile = "Dockerfile.apache.node"
   args = {
     PHP_VERSION = "7.4"
-    VARIANT = "apache-node18"
+    VARIANT = "apache-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php74-apache"
@@ -1447,48 +1447,48 @@ target "php74-fpm" {
   }
 }
 
-# thecodingmachine/php:7.4-v5-fpm-node22
-target "php74-fpm-node22" {
+# thecodingmachine/php:7.4-v5-fpm-node24
+target "php74-fpm-node24" {
   inherits = ["default"]
-  tags = tag("7.4", "fpm-node22")
+  tags = tag("7.4", "fpm-node24")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "7.4"
-    VARIANT = "fpm-node22"
+    VARIANT = "fpm-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php74-fpm"
   }
 }
 
-# thecodingmachine/php:7.4-v5-fpm-node20
-target "php74-fpm-node20" {
+# thecodingmachine/php:7.4-v5-fpm-node22
+target "php74-fpm-node22" {
   inherits = ["default"]
-  tags = tag("7.4", "fpm-node20")
+  tags = tag("7.4", "fpm-node22")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "7.4"
-    VARIANT = "fpm-node20"
+    VARIANT = "fpm-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php74-fpm"
   }
 }
 
-# thecodingmachine/php:7.4-v5-fpm-node18
-target "php74-fpm-node18" {
+# thecodingmachine/php:7.4-v5-fpm-node20
+target "php74-fpm-node20" {
   inherits = ["default"]
-  tags = tag("7.4", "fpm-node18")
+  tags = tag("7.4", "fpm-node20")
   dockerfile = "Dockerfile.fpm.node"
   args = {
     PHP_VERSION = "7.4"
-    VARIANT = "fpm-node18"
+    VARIANT = "fpm-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php74-fpm"
@@ -1524,48 +1524,48 @@ target "php74-cli" {
   }
 }
 
-# thecodingmachine/php:7.4-v5-cli-node22
-target "php74-cli-node22" {
+# thecodingmachine/php:7.4-v5-cli-node24
+target "php74-cli-node24" {
   inherits = ["default"]
-  tags = tag("7.4", "cli-node22")
+  tags = tag("7.4", "cli-node24")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "7.4"
-    VARIANT = "cli-node22"
+    VARIANT = "cli-node24"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "22"
+    NODE_VERSION = "24"
   }
   contexts = {
     fat = "target:php74-cli"
   }
 }
 
-# thecodingmachine/php:7.4-v5-cli-node20
-target "php74-cli-node20" {
+# thecodingmachine/php:7.4-v5-cli-node22
+target "php74-cli-node22" {
   inherits = ["default"]
-  tags = tag("7.4", "cli-node20")
+  tags = tag("7.4", "cli-node22")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "7.4"
-    VARIANT = "cli-node20"
+    VARIANT = "cli-node22"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "20"
+    NODE_VERSION = "22"
   }
   contexts = {
     fat = "target:php74-cli"
   }
 }
 
-# thecodingmachine/php:7.4-v5-cli-node18
-target "php74-cli-node18" {
+# thecodingmachine/php:7.4-v5-cli-node20
+target "php74-cli-node20" {
   inherits = ["default"]
-  tags = tag("7.4", "cli-node18")
+  tags = tag("7.4", "cli-node20")
   dockerfile = "Dockerfile.cli.node"
   args = {
     PHP_VERSION = "7.4"
-    VARIANT = "cli-node18"
+    VARIANT = "cli-node20"
     FROM_IMAGE = "fat"
-    NODE_VERSION = "18"
+    NODE_VERSION = "20"
   }
   contexts = {
     fat = "target:php74-cli"
diff --git a/orbit-images.yml b/orbit-images.yml
index d60cf78..3b52f23 100644
--- a/orbit-images.yml
+++ b/orbit-images.yml
@@ -1,2 +1,2 @@
 php_version: "8.4"
-node_version: "22"
+node_version: "24"
diff --git a/utils/README.blueprint.md b/utils/README.blueprint.md
index f310aa4..0b04fce 100644
--- a/utils/README.blueprint.md
+++ b/utils/README.blueprint.md
@@ -17,7 +17,7 @@ This repository contains a set of developer-friendly, general purpose PHP images
 ## Images
 
 {{ $versions := list "8.4" "8.3" "8.2" "8.1" }}
-{{ $nodeVersions := list "18" "20" "22" }}
+{{ $nodeVersions := list "20" "22" "24" }}
 
 | Name                                                                    | PHP version                                                                                                                                        | type                                       |variant | NodeJS version  | Size 
 |-------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------|--------|-----------------|------
diff --git a/utils/docker-bake.blueprint.hcl b/utils/docker-bake.blueprint.hcl
index 9e6815d..6e2e321 100644
--- a/utils/docker-bake.blueprint.hcl
+++ b/utils/docker-bake.blueprint.hcl
@@ -1,4 +1,4 @@
-{{ $variants := list "apache" "fpm" "cli" }}{{ $versions := list "8.4" "8.3" "8.2" "8.1" "8.0" "7.4" }}{{ $nodeVersions := list "22" "20" "18" }}
+{{ $variants := list "apache" "fpm" "cli" }}{{ $versions := list "8.4" "8.3" "8.2" "8.1" "8.0" "7.4" }}{{ $nodeVersions := list "24" "22" "20" }}
 group "default" {
    targets = [
      {{range $phpV := $versions}}