diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 7b27bf3..2c68a3b 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -32,15 +32,18 @@ jobs:
           - default   # PHP 8.1 and beyond. Only uses 8.1 style lists for all php versions.
           - php81legacy  # Mixes new 8.1 style list and keeps pre-8.1 module lists.
         image:
-          - registry.gitlab.com/aussielunix/ansible/molecule-containers/ubuntu:jammy
-          - registry.gitlab.com/aussielunix/ansible/molecule-containers/ubuntu:focal
+          - geerlingguy/docker-ubuntu2404-ansible:latest
+          - geerlingguy/docker-ubuntu2204-ansible:latest
+          - geerlingguy/docker-ubuntu2004-ansible:latest
+          - geerlingguy/docker-ubuntu1804-ansible:latest
+          - geerlingguy/docker-ubuntu1604-ansible:latest
     steps:
       - name: checkout
         uses: actions/checkout@v3
         with:
           path: "${{ github.repository }}"
       - name: molecule
-        uses: robertdebock/molecule-action@4.0.9
+        uses: robertdebock/molecule-action@6.0.1
         with:
           options: parallel
           scenario: "${{ matrix.scenario }}"
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index c789bb0..d6de0a6 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -6,7 +6,11 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "registry.gitlab.com/aussielunix/ansible/molecule-containers/${MOLECULE_DISTRO:-ubuntu:jammy}"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     pre_build_image: true
     override_command: false
diff --git a/molecule/php7.4/molecule.yml b/molecule/php7.4/molecule.yml
index 6656a9f..55ebf66 100644
--- a/molecule/php7.4/molecule.yml
+++ b/molecule/php7.4/molecule.yml
@@ -6,7 +6,11 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "registry.gitlab.com/aussielunix/ansible/molecule-containers/${MOLECULE_DISTRO:-ubuntu:jammy}"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     pre_build_image: true
     override_command: false
diff --git a/molecule/php8.0/molecule.yml b/molecule/php8.0/molecule.yml
index 81464d2..1a1f4a5 100644
--- a/molecule/php8.0/molecule.yml
+++ b/molecule/php8.0/molecule.yml
@@ -6,7 +6,11 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "registry.gitlab.com/aussielunix/ansible/molecule-containers/${MOLECULE_DISTRO:-ubuntu:jammy}"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     pre_build_image: true
     override_command: false
diff --git a/molecule/php81legacy/molecule.yml b/molecule/php81legacy/molecule.yml
index 63b69a9..be05342 100644
--- a/molecule/php81legacy/molecule.yml
+++ b/molecule/php81legacy/molecule.yml
@@ -6,7 +6,11 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "registry.gitlab.com/aussielunix/ansible/molecule-containers/${MOLECULE_DISTRO:-ubuntu:jammy}"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    cgroupns_mode: host
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     pre_build_image: true
     override_command: false