diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index db6552a..477d155 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -21,6 +21,14 @@ jobs:
       fail-fast: false
       matrix:
         combo:
+          - otp-version: '25'
+            elixir-version: '1'
+            rebar3-version: '3'
+            os: 'ubuntu-22.04'
+          - otp-version: '24'
+            elixir-version: '1'
+            rebar3-version: '3'
+            os: 'ubuntu-22.04'
           - otp-version: '25.0'
             elixir-version: 'v1.13.4-otp-25'
             rebar3-version: '3.18.0'
diff --git a/README.md b/README.md
index f6f44eb..2b98a16 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ and Erlang/OTP.
 |-                 |-           |-
 | ubuntu-18.04     | 17 - 25    | ✅
 | ubuntu-20.04     | 20 - 25    | ✅
+| ubuntu-22.04     | 24.2 - 25  | ✅
 | windows-2019     | 21* - 25   | ✅
 | windows-2022     | 21* - 25   | ✅
 
@@ -65,6 +66,7 @@ uses that to download assets:
 |-         |-
 | ubuntu18 | ubuntu-18.04
 | ubuntu20 | ubuntu-20.04
+| ubuntu22 | ubuntu-22.04
 | win19    | windows-2019
 | win22    | windows-2022
 
diff --git a/dist/index.js b/dist/index.js
index 3a1b1cb..e5a8bf1 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -6457,6 +6457,7 @@ function getRunnerOSVersion() {
   const ImageOSToContainer = {
     ubuntu18: 'ubuntu-18.04',
     ubuntu20: 'ubuntu-20.04',
+    ubuntu22: 'ubuntu-22.04',
     win19: 'windows-2019',
     win22: 'windows-2022',
   }
diff --git a/src/setup-beam.js b/src/setup-beam.js
index 74e1d91..91629be 100644
--- a/src/setup-beam.js
+++ b/src/setup-beam.js
@@ -405,6 +405,7 @@ function getRunnerOSVersion() {
   const ImageOSToContainer = {
     ubuntu18: 'ubuntu-18.04',
     ubuntu20: 'ubuntu-20.04',
+    ubuntu22: 'ubuntu-22.04',
     win19: 'windows-2019',
     win22: 'windows-2022',
   }