diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index c42ba35..69bd47e 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -8,13 +8,12 @@ on:
   pull_request:
     branches:
       - master
-      - 2-nginx_aliases-is-a-lie
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: "${{ github.repository }}"
       - name: molecule
@@ -28,17 +27,19 @@ jobs:
     strategy:
       matrix:
         image:
+          - geerlingguy/docker-ubuntu2404-ansible:latest
+          - geerlingguy/docker-ubuntu2204-ansible:latest
           - geerlingguy/docker-ubuntu2004-ansible:latest
-          - geerlingguy/docker-ubuntu1804-ansible:latest
+          #- geerlingguy/docker-ubuntu1804-ansible:latest  # No PHP 8.1 support
           #- geerlingguy/docker-centos8-ansible:latest   # Can't test this until the PHP role supports CentOS
           #- geerlingguy/docker-centos7-ansible:latest   # Can't test this until the PHP role supports CentOS
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: "${{ github.repository }}"
       - name: molecule
-        uses: robertdebock/molecule-action@2.6.8
+        uses: robertdebock/molecule-action@6.0.1
         with:
           image: "${{ matrix.image }}"
           options: parallel
diff --git a/meta/main.yml b/meta/main.yml
index ae7bfef..cc99058 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -12,9 +12,10 @@ galaxy_info:
   platforms:
   - name: Ubuntu
     versions:
+      - noble  # 24.04
       - jammy   # 22.04
       - focal   # 20.04
-      - bionic   # 18.04
+      #- bionic   # 18.04 ... No php 8.1 support.
   - name: EL   # Or CentOS, or Rocky
     versions:
       - 8
diff --git a/molecule/default/group_vars/all.yml b/molecule/default/group_vars/all.yml
index f82b339..07167f7 100644
--- a/molecule/default/group_vars/all.yml
+++ b/molecule/default/group_vars/all.yml
@@ -13,12 +13,12 @@ nginx_robots_policy: production
 # ---------------------------------
 # acromedia.php
 # ---------------------------------
-php_default_version: 8.1
+php_default_version: 8.3
 php_use_legacy_module_lists: false
 php_versions:
-  - 7.4
-  - 8.0
   - 8.1
+  - 8.2
+  - 8.3
 
 # ---------------------------------
 # acromedia.virtual-host
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index fe73b45..8fdf891 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -6,10 +6,14 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "registry.gitlab.com/aussielunix/ansible/molecule-containers/${MOLECULE_DISTRO:-ubuntu:jammy}"
+    image: ${MOLECULE_DOCKER_IMAGE:-'geerlingguy/docker-ubuntu2404-ansible:latest'}
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    cgroupns_mode: host
     privileged: true
     pre_build_image: true
     override_command: false
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     tmpfs:
       - /run
       - /tmp