diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f5d99a..9f010b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -55,7 +55,7 @@ jobs:
 
   test:
     name: Molecule test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     strategy:
       max-parallel: 3
@@ -143,7 +143,7 @@ jobs:
   test-all:
     if: ${{ always() }}
     name: Test (matrix)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs:
       - lint
       - test
diff --git a/README.md b/README.md
index 553f734..7196cb6 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 19de36d..2d25e39 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 80ae7c8..b8fcb0d 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -14,7 +14,7 @@ role_name_check: 2
 
 platforms:
   - name: ansible-role-java-default
-    image: ubuntu:22.04
+    image: ubuntu:24.04
 
 verifier:
   name: testinfra
diff --git a/molecule/ubuntu-max-java-max-lts-offline/molecule.yml b/molecule/ubuntu-max-java-max-lts-offline/molecule.yml
index 58a3c13..c5fa0a3 100644
--- a/molecule/ubuntu-max-java-max-lts-offline/molecule.yml
+++ b/molecule/ubuntu-max-java-max-lts-offline/molecule.yml
@@ -9,7 +9,7 @@ role_name_check: 2
 
 platforms:
   - name: ansible-role-java-ubuntu-max-java-max-lts
-    image: ubuntu:22.04
+    image: ubuntu:24.04
 
 provisioner:
   name: ansible
diff --git a/molecule/ubuntu-max-java-max-non-lts-offline/molecule.yml b/molecule/ubuntu-max-java-max-non-lts-offline/molecule.yml
index 23c6ac8..9c71238 100644
--- a/molecule/ubuntu-max-java-max-non-lts-offline/molecule.yml
+++ b/molecule/ubuntu-max-java-max-non-lts-offline/molecule.yml
@@ -9,7 +9,7 @@ role_name_check: 2
 
 platforms:
   - name: ansible-role-java-ubuntu-max-java-max-non-lts
-    image: ubuntu:22.04
+    image: ubuntu:24.04
 
 provisioner:
   name: ansible
diff --git a/molecule/ubuntu-max-java-min-offline/molecule.yml b/molecule/ubuntu-max-java-min-offline/molecule.yml
index b2008a7..12b9821 100644
--- a/molecule/ubuntu-max-java-min-offline/molecule.yml
+++ b/molecule/ubuntu-max-java-min-offline/molecule.yml
@@ -9,7 +9,7 @@ role_name_check: 2
 
 platforms:
   - name: ansible-role-java-ubuntu-max
-    image: ubuntu:22.04
+    image: ubuntu:24.04
 
 provisioner:
   name: ansible
diff --git a/molecule/ubuntu-max-java-old-lts-offline/molecule.yml b/molecule/ubuntu-max-java-old-lts-offline/molecule.yml
index 145622e..b489c48 100644
--- a/molecule/ubuntu-max-java-old-lts-offline/molecule.yml
+++ b/molecule/ubuntu-max-java-old-lts-offline/molecule.yml
@@ -9,7 +9,7 @@ role_name_check: 2
 
 platforms:
   - name: ansible-role-java-ubuntu-max-java-old-lts
-    image: ubuntu:22.04
+    image: ubuntu:24.04
 
 provisioner:
   name: ansible