diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 727b876..0043a92 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ env:
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -54,7 +54,7 @@ jobs:
 
   test:
     name: Molecule test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:
@@ -113,7 +113,7 @@ jobs:
   test-all:
     if: ${{ always() }}
     name: Test (matrix)
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - lint
       - test
diff --git a/README.md b/README.md
index 8a1ea49..e12d5f4 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ Requirements
 
             * Focal (20.04)
             * Jammy (22.04)
+            * Noble (24.04)
 
     * RedHat Family
 
diff --git a/meta/main.yml b/meta/main.yml
index eb434c6..d07dfa5 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -19,6 +19,7 @@ galaxy_info:
       versions:
         - focal
         - jammy
+        - noble
     - name: Debian
       versions:
         - buster
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 6d9e7ec..7cdc679 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -9,7 +9,7 @@ role_name_check: 2
 
 platforms:
   - name: ansible-role-maven-ubuntu-max
-    image: ubuntu:22.04
+    image: ubuntu:24.04
 
 provisioner:
   name: ansible