diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 836b1d0..8ff77e0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,8 +36,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
+          - ubuntu2404
           - ubuntu2204
-          - ubuntu2004
           - debian12
           - debian11
         scenario: ${{ fromJSON(needs.changes.outputs.scenario) }}
diff --git a/molecule/Dockerfile.j2 b/molecule/Dockerfile.j2
deleted file mode 100644
index 09621b5..0000000
--- a/molecule/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-# Molecule managed
-
-{% if item.registry is defined %}
-FROM {{ item.registry.url }}/{{ item.image }}
-{% else %}
-FROM {{ item.image }}
-{% endif %}
-
-{% if item.env is defined %}
-{% for var, value in item.env.items() %}
-{% if value %}
-ENV {{ var }} {{ value }}
-{% endif %}
-{% endfor %}
-{% endif %}
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && apt-get install -y python3 sudo bash ca-certificates iproute2 python3-apt aptitude init && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
diff --git a/molecule/base-custom.yml b/molecule/base-custom.yml
deleted file mode 100644
index e5c1c81..0000000
--- a/molecule/base-custom.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-dependency:
-  name: galaxy
-  options:
-    ignore-certs: true
-    ignore-errors: true
-    role-file: requirements.yml
-    requirements-file: requirements.yml
-driver:
-  name: docker
-platforms:
-  - name: instance
-    image: ${MOLECULE_DISTRO:-'ubuntu:jammy'}
-    dockerfile: ../Dockerfile.j2
-    pre_build_image: false
-    privileged: true
-    command: /sbin/init
-    tmpfs:
-      - /run
-      - /tmp
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-provisioner:
-  name: ansible
-  log: true
-  playbooks:
-    prepare: ../prepare-custom.yml
diff --git a/molecule/base-delegate.yml b/molecule/base-delegate.yml
deleted file mode 100644
index 2075cf2..0000000
--- a/molecule/base-delegate.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-dependency:
-  name: galaxy
-driver:
-  name: delegated
-platforms:
-  # must be able to `ssh molecule-test-instance`, edit your ~/.ssh/config
-  - name: molecule-test-instance
-provisioner:
-  name: ansible
-  log: true
-  playbooks:
-    prepare: ../prepare.yml
diff --git a/molecule/base.yml b/molecule/base.yml
index 3e4b043..69df033 100644
--- a/molecule/base.yml
+++ b/molecule/base.yml
@@ -10,7 +10,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2404}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
diff --git a/molecule/prepare-custom.yml b/molecule/prepare-custom.yml
deleted file mode 100644
index d6d9954..0000000
--- a/molecule/prepare-custom.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  become: true
-  pre_tasks:
-    - name: Update apt cache
-      package:
-        update_cache: true
-    - name: Ensure ACL package
-      package:
-        name: acl
-        state: present
-    - name: Ensure /proc file system utilities
-      package:
-        name: procps
-        state: present
-    - name: Ensure auth.log file is present
-      copy:
-        dest: /var/log/auth.log
-        content: ""
-        force: false
-        mode: 0644
-      when: ansible_distribution == 'Debian'