diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7aaf234a..74e478d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,6 +73,10 @@ jobs:
             castor:
               bin: 'bin/castor'
               method: 'bin/castor'
+          - php: "8.4"
+            castor:
+              bin: 'bin/castor'
+              method: 'bin/castor'
 
     steps:
       - name: Checkout
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2518249a..5aac29a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Add a option `ignoreValidationErrors` on `AsTask` attribute to ignore
   parameters & options validation errors
 * Add a way to merge an application `box.json` config file used by `castor:repack`command
+* Add support for PHP 8.4
 * Deprecate `Context::withPath()` in favor of `Context::withWorkingDirectory()`
 * Deprecate `path` argument in `capture()`, `exit_code()`, `run()`, `with()` in favor of `workingDirectory`