diff --git a/.github/settings.yml b/.github/settings.yml
index 8943b802..91c68eca 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -14,15 +14,17 @@ branches:
         required_approving_review_count: 1
       required_status_checks:
         checks:
-          - context: "Coding Standards (8.3, locked)"
-          - context: "Dependency Analysis (8.3, locked)"
-          - context: "Static Code Analysis (8.3, locked)"
+          - context: "Coding Standards (8.4, locked)"
+          - context: "Dependency Analysis (8.4, locked)"
+          - context: "Static Code Analysis (8.4, locked)"
           - context: "Tests (8.1, locked)"
           - context: "Tests (8.1, lowest)"
           - context: "Tests (8.2, locked)"
           - context: "Tests (8.2, lowest)"
           - context: "Tests (8.3, locked)"
           - context: "Tests (8.3, lowest)"
+          - context: "Tests (8.4, locked)"
+          - context: "Tests (8.4, lowest)"
         strict: false
       restrictions: null
 
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index b73db659..a00358c7 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.3"
+          - "8.4"
 
         dependencies:
           - "locked"
@@ -74,7 +74,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.3"
+          - "8.4"
 
         dependencies:
           - "locked"
@@ -108,7 +108,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.3"
+          - "8.4"
 
         dependencies:
           - "locked"
@@ -168,6 +168,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
         dependencies:
           - "lowest"
diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml
index 2b1cf990..c438c50e 100644
--- a/.github/workflows/renew.yaml
+++ b/.github/workflows/renew.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.3"
+          - "8.4"
 
         dependencies:
           - "locked"
diff --git a/composer.json b/composer.json
index c67d3e3c..3f4eba0b 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
     "source": "https://github.com/Lctrs/psalm-psr-container-plugin"
   },
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
     "ext-simplexml": "*",
     "nikic/php-parser": "^4.19.4",
     "psr/container": "^1.1.2 || ^2.0.2",
diff --git a/composer.lock b/composer.lock
index 6db674e1..f8d412ac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c4265d46c7e86d2c3e420661b443d2d7",
+    "content-hash": "f5cfcc4602f2faeb4a86e2cef67d038f",
     "packages": [
         {
             "name": "amphp/amp",
@@ -6046,7 +6046,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-simplexml": "*"
     },
     "platform-dev": {},