diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
index c77294fbc..8579e2e28 100644
--- a/.github/workflows/proxy.yml
+++ b/.github/workflows/proxy.yml
@@ -76,9 +76,9 @@ jobs:
 
       - name: Run role tests
         run: >-
-          MY_MOLECULE_CONTAINER=${{ matrix.container }}
-          MY_MOLECULE_IMAGE=${{ matrix.container }}
+          MY_MOLECULE_CONTAINER=${{ matrix.container.name }}
+          MY_MOLECULE_IMAGE=${{ matrix.container.base_image }}
+          MY_MOLECULE_OS_FAMILY=${{ matrix.container.os_family }}
           MY_MOLECULE_VERSION=${{ matrix.version }}
           MY_MOLECULE_DATABASE=${{ matrix.database }}
-          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.command }}
           molecule test -s ${{ matrix.collection_role }}
diff --git a/molecule/zabbix_proxy/Dockerfile.redhat.j2 b/molecule/zabbix_proxy/Dockerfile.redhat.j2
new file mode 100644
index 000000000..dd48ee3b7
--- /dev/null
+++ b/molecule/zabbix_proxy/Dockerfile.redhat.j2
@@ -0,0 +1,3 @@
+FROM {{ item.base_image }}
+RUN yum install -y python3-pip
+CMD ["/sbin/init"]
diff --git a/molecule/zabbix_proxy/destroy.yml b/molecule/zabbix_proxy/destroy.yml
new file mode 100644
index 000000000..7ef374be5
--- /dev/null
+++ b/molecule/zabbix_proxy/destroy.yml
@@ -0,0 +1,23 @@
+---
+- name: Destroy
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
+  vars:
+    molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}"
+    molecule_yml: "{{ lookup('file', molecule_file) | from_yaml }}"
+  tasks:
+    - name: Destroy molecule instance(s)
+      docker_container:
+        name: "{{ item.name }}"
+        state: absent
+        force_kill: "{{ item.force_kill | default(True) }}"
+      with_items: "{{ molecule_yml.platforms }}"
+
+    - name: Destroy 3rd party instance(s)
+      docker_container:
+        name: "{{ item.name }}-db"
+        state: absent
+        force_kill: true
+      loop: "{{ molecule_yml.platforms }}"
diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml
index ac0d7e33c..8c7b3df48 100644
--- a/molecule/zabbix_proxy/molecule.yml
+++ b/molecule/zabbix_proxy/molecule.yml
@@ -3,10 +3,11 @@ driver:
   name: docker
 platforms:
   - name: zabbix-proxy-${MY_MOLECULE_VERSION:-v70}-${MY_MOLECULE_DATABASE:-mysql}-${MY_MOLECULE_CONTAINER:-rockylinux8}
-    image: geerlingguy/docker-${MY_MOLECULE_IMAGE:-rockylinux8}-ansible:latest
+    dockerfile: Dockerfile.${MY_MOLECULE_OS_FAMILY:-redhat}.j2
+    base_image: ${MY_MOLECULE_IMAGE:-rockylinux/rockylinux:8-ubi-init}
+    image: ${MY_MOLECULE_CONTAINER:-rockylinux8}
     privileged: true
-    pre_build_image: true
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    command: /sbin/init
     networks:
       - name: zabbix
     volumes: