diff --git a/bindep.txt b/bindep.txt
index 1f190fd..71b584e 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -24,7 +24,7 @@ libxml2-devel     [platform:rpm]
 libxslt-devel     [platform:rpm]
 libxslt1-dev      [platform:dpkg]
 libxslt-dev       [platform:apk]
-
+podman            [platform:rpm]
 python-devel      [platform:rpm !platform:rhel-8 !platform:centos-8]
 python3-devel     [platform:rpm !platform:rhel-7 !platform:centos-7]
 PyYAML            [platform:rpm !platform:rhel-8 !platform:centos-8]
diff --git a/molecule-requirements.txt b/molecule-requirements.txt
index c55af13..4387810 100644
--- a/molecule-requirements.txt
+++ b/molecule-requirements.txt
@@ -1,7 +1,6 @@
 # this is required for the molecule jobs
 ansible
 ansi2html
-docker
 # https://github.com/sqlalchemy/dogpile.cache/issues/178
 dogpile.cache>=0.6.5,<0.9.1  # MIT
 pytest
diff --git a/scripts/run-local-test b/scripts/run-local-test
index c2e7258..8aae65b 100755
--- a/scripts/run-local-test
+++ b/scripts/run-local-test
@@ -40,6 +40,10 @@ case "${ID,,}" in
         ;;
 esac
 
+# Ensure the required ci file is present
+sudo mkdir -p /etc/ci
+sudo touch /etc/ci/mirror_info.sh
+
 # Create a virtual env
 "${PYTHON_EXEC}" -m virtualenv --system-site-packages "${HOME}/test-python"
 
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
deleted file mode 100755
index e3179bf..0000000
--- a/tools/test-setup.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -euxo pipefail
-# Used by Zuul CI to perform extra bootstrapping
-
-# Workaround for a potential:
-# Got permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock
-# See https://docs.docker.com/install/linux/linux-postinstall/
-newgrp docker || true
diff --git a/validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml b/validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml
index d7df600..aa3d554 100644
--- a/validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml
+++ b/validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -15,6 +15,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -23,6 +25,7 @@ platforms:
     pkg_extras: python*-setuptools python*-PyYAML
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/check_cpu/molecule/default/molecule.yml b/validations_common/roles/check_cpu/molecule/default/molecule.yml
index 145ed47..e84978a 100644
--- a/validations_common/roles/check_cpu/molecule/default/molecule.yml
+++ b/validations_common/roles/check_cpu/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -15,6 +15,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -23,6 +25,7 @@ platforms:
     pkg_extras: python*-setuptools
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/check_disk_space/molecule/default/molecule.yml b/validations_common/roles/check_disk_space/molecule/default/molecule.yml
index 145ed47..e84978a 100644
--- a/validations_common/roles/check_disk_space/molecule/default/molecule.yml
+++ b/validations_common/roles/check_disk_space/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -15,6 +15,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -23,6 +25,7 @@ platforms:
     pkg_extras: python*-setuptools
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml b/validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml
index d7df600..aa3d554 100644
--- a/validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml
+++ b/validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -15,6 +15,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -23,6 +25,7 @@ platforms:
     pkg_extras: python*-setuptools python*-PyYAML
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/check_ram/molecule/default/molecule.yml b/validations_common/roles/check_ram/molecule/default/molecule.yml
index 145ed47..e84978a 100644
--- a/validations_common/roles/check_ram/molecule/default/molecule.yml
+++ b/validations_common/roles/check_ram/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -15,6 +15,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -23,6 +25,7 @@ platforms:
     pkg_extras: python*-setuptools
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/check_selinux_mode/molecule/default/molecule.yml b/validations_common/roles/check_selinux_mode/molecule/default/molecule.yml
index e37e80d..64f0b97 100644
--- a/validations_common/roles/check_selinux_mode/molecule/default/molecule.yml
+++ b/validations_common/roles/check_selinux_mode/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -15,6 +15,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -23,6 +25,7 @@ platforms:
     pkg_extras: python*-setuptools ruby python*-PyYAML
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/dns/molecule/default/molecule.yml b/validations_common/roles/dns/molecule/default/molecule.yml
index 145ed47..e84978a 100644
--- a/validations_common/roles/dns/molecule/default/molecule.yml
+++ b/validations_common/roles/dns/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -15,6 +15,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -23,6 +25,7 @@ platforms:
     pkg_extras: python*-setuptools
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/haproxy/molecule/default/molecule.yml b/validations_common/roles/haproxy/molecule/default/molecule.yml
index 47fea4c..173bc31 100644
--- a/validations_common/roles/haproxy/molecule/default/molecule.yml
+++ b/validations_common/roles/haproxy/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -15,6 +15,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -23,6 +25,7 @@ platforms:
     pkg_extras: python*-setuptools haproxy python*-PyYAML
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/ntp/molecule/default/molecule.yml b/validations_common/roles/ntp/molecule/default/molecule.yml
index 5616d4a..1b71823 100644
--- a/validations_common/roles/ntp/molecule/default/molecule.yml
+++ b/validations_common/roles/ntp/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -15,6 +15,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -23,6 +25,7 @@ platforms:
     pkg_extras: python*-setuptools python*-enum34 ruby python*-PyYAML
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/service_status/molecule/default/molecule.yml b/validations_common/roles/service_status/molecule/default/molecule.yml
index 929fbaf..0d175d8 100644
--- a/validations_common/roles/service_status/molecule/default/molecule.yml
+++ b/validations_common/roles/service_status/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -17,6 +17,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -27,6 +29,7 @@ platforms:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/service_status/molecule/podman/molecule.yml b/validations_common/roles/service_status/molecule/podman/molecule.yml
index 929fbaf..0d175d8 100644
--- a/validations_common/roles/service_status/molecule/podman/molecule.yml
+++ b/validations_common/roles/service_status/molecule/podman/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -17,6 +17,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -27,6 +29,7 @@ platforms:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/service_status/molecule/systemd/molecule.yml b/validations_common/roles/service_status/molecule/systemd/molecule.yml
index 90ad19f..e1096f6 100644
--- a/validations_common/roles/service_status/molecule/systemd/molecule.yml
+++ b/validations_common/roles/service_status/molecule/systemd/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -16,6 +16,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -26,6 +28,7 @@ platforms:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/validate_selinux/molecule/default/molecule.yml b/validations_common/roles/validate_selinux/molecule/default/molecule.yml
index 2bac00c..2e089af 100644
--- a/validations_common/roles/validate_selinux/molecule/default/molecule.yml
+++ b/validations_common/roles/validate_selinux/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -15,6 +15,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -23,6 +25,7 @@ platforms:
     pkg_extras: python*-setuptools
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible
diff --git a/validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml b/validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml
index cff6cb6..d54013c 100644
--- a/validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml
+++ b/validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 
 log: true
 
@@ -16,6 +16,8 @@ platforms:
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
+    ulimits: &ulimit
+      - host
 
   - name: centos8
     hostname: centos8
@@ -25,6 +27,7 @@ platforms:
     pkg_extras: python*-setuptools
     environment:
       <<: *env
+    ulimits: *ulimit
 
 provisioner:
   name: ansible