diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index fd24eacb7..e13998410 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-22.04, ubuntu-20.04, windows-2022, macos-12]
+        operating-system: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-2022, macos-12]
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
     steps:
       - name: Setup PHP
@@ -72,7 +72,7 @@ jobs:
           git config --local user.name "${{ github.repository_owner }}"
       - name: Combine
         run: |
-          for os in ubuntu-22.04 ubuntu-20.04 windows-2022 windows-2019 macos-11 macos-12 macos-13; do
+          for os in ubuntu-24.04 ubuntu-22.04 ubuntu-20.04 windows-2022 windows-2019 macos-11 macos-12 macos-13; do
             echo "These are extensions which are loaded by default on the following PHP versions. More extensions which are available as packages and available on pecl are supported by setup-php. Refer to [php extension support](https://github.com/shivammathur/setup-php#heavy_plus_sign-php-extension-support) for more details." > Php-extensions-loaded-on-"$os".md
             for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4; do
               if [[ "$os" = "macos-11" || "$os" = "macos-13" ]]; then
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 1d097afc6..83c6e7eb9 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -28,10 +28,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ubuntu-22.04, ubuntu-20.04, windows-2019, macos-13]
+        operating-system: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-2019, macos-13]
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         include:
-          - operating-system: ubuntu-22.04
+          - operating-system: ubuntu-24.04
             php-versions: ''
             php-version-file: 'php-version-file'
     env:
diff --git a/README.md b/README.md
index 9b20f164b..2ce8b1e77 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,7 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 
 | Virtual environment | YAML workflow label                | Pre-installed PHP      |
 |---------------------|------------------------------------|------------------------|
+| Ubuntu 24.04        | `ubuntu-24.04`                     | `PHP 8.3`              |
 | Ubuntu 22.04        | `ubuntu-latest` or `ubuntu-22.04`  | `PHP 8.1`              |
 | Ubuntu 20.04        | `ubuntu-20.04`                     | `PHP 7.4` to `PHP 8.3` |
 | Windows Server 2022 | `windows-latest` or `windows-2022` | `PHP 8.3`              |
@@ -82,6 +83,7 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
 
 | Host OS/Virtual environment      | YAML workflow label        |
 |----------------------------------|----------------------------|
+| Ubuntu 24.04                     | `self-hosted` or `Linux`   |
 | Ubuntu 22.04                     | `self-hosted` or `Linux`   |
 | Ubuntu 20.04                     | `self-hosted` or `Linux`   |
 | Debian 11                        | `self-hosted` or `Linux`   |
@@ -717,6 +719,9 @@ Choose the image tag which matches the `runs-on` property in your workflow. For
 # For runs-on: ubuntu-latest
 act -P ubuntu-latest=shivammathur/node:latest
 
+# For runs-on: ubuntu-24.04
+act -P ubuntu-24.04=shivammathur/node:2404
+
 # For runs-on: ubuntu-22.04
 act -P ubuntu-22.04=shivammathur/node:2204