diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 256e1c5d..81008a15 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -39,6 +39,14 @@ jobs:
             elixir-version: '1.14.3'
             os: 'ubuntu-latest'
             version-type: 'strict'
+          - otp-version: '27'
+            os: 'ubuntu-24.04'
+            version-type: 'strict'
+          - otp-version: '26'
+            os: 'ubuntu-24.04'
+            version-type: 'strict'
+          - otp-version: '25'
+            os: 'ubuntu-24.04'
           - otp-version: '25'
             elixir-version: '1'
             rebar3-version: '3'
diff --git a/README.md b/README.md
index 74698245..b860ad96 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,7 @@ uses that to download assets:
 | ubuntu18 | ubuntu-18.04
 | ubuntu20 | ubuntu-20.04
 | ubuntu22 | ubuntu-22.04
+| ubuntu24 | ubuntu-24.04
 | win19    | windows-2019
 | win22    | windows-2022
 
diff --git a/dist/index.js b/dist/index.js
index b4a96048..117da2f2 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -10314,6 +10314,7 @@ function getRunnerOSVersion() {
     ubuntu18: 'ubuntu-18.04',
     ubuntu20: 'ubuntu-20.04',
     ubuntu22: 'ubuntu-22.04',
+    ubuntu24: 'ubuntu-24.04',
     win19: 'windows-2019',
     win22: 'windows-2022',
   }
diff --git a/src/setup-beam.js b/src/setup-beam.js
index 2c95a3f0..5412eeeb 100644
--- a/src/setup-beam.js
+++ b/src/setup-beam.js
@@ -483,6 +483,7 @@ function getRunnerOSVersion() {
     ubuntu18: 'ubuntu-18.04',
     ubuntu20: 'ubuntu-20.04',
     ubuntu22: 'ubuntu-22.04',
+    ubuntu24: 'ubuntu-24.04',
     win19: 'windows-2019',
     win22: 'windows-2022',
   }
diff --git a/test/setup-beam.test.js b/test/setup-beam.test.js
index ed5b11c9..131042fb 100644
--- a/test/setup-beam.test.js
+++ b/test/setup-beam.test.js
@@ -130,6 +130,20 @@ async function testOTPVersions() {
 
   if (process.platform === 'linux') {
     before = simulateInput('version-type', 'strict')
+    spec = '26'
+    osVersion = 'ubuntu-24.04'
+    expected = 'maint-26'
+    got = await setupBeam.getOTPVersion(spec, osVersion, hexMirrors)
+    assert.deepStrictEqual(got, expected)
+
+    simulateInput('version-type', before)
+    spec = '27.0'
+    osVersion = 'ubuntu-24.04'
+    expected = 'OTP-27.0'
+    got = await setupBeam.getOTPVersion(spec, osVersion, hexMirrors)
+    assert.deepStrictEqual(got, expected)
+
+    simulateInput('version-type', before)
     spec = '25.3.2.1'
     osVersion = 'ubuntu-20.04'
     expected = 'OTP-25.3.2.1'