diff --git a/roles/check_undercloud_conf/molecule/config_OK/Dockerfile.j2 b/roles/check_undercloud_conf/molecule/config_OK/Dockerfile
similarity index 100%
rename from roles/check_undercloud_conf/molecule/config_OK/Dockerfile.j2
rename to roles/check_undercloud_conf/molecule/config_OK/Dockerfile
diff --git a/roles/check_undercloud_conf/molecule/config_OK/molecule.yml b/roles/check_undercloud_conf/molecule/config_OK/molecule.yml
index e1873b35e..28b449b6d 100644
--- a/roles/check_undercloud_conf/molecule/config_OK/molecule.yml
+++ b/roles/check_undercloud_conf/molecule/config_OK/molecule.yml
@@ -5,12 +5,18 @@ driver:
 log: true
 
 platforms:
-  - name: centos8
-    hostname: centos8
-    image: centos:8
-    pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release iputils python*-PyYAML
+  - name: ubi8
+    hostname: ubi8
+    image: ubi8/ubi-init
+    registry:
+      url: registry.access.redhat.com
+    dockerfile: Dockerfile
+    pkg_extras: python*-setuptools python*-pyyaml
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
+      - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
+      - /opt/yum.repos.d:/etc/yum.repos.d:rw
+    privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
@@ -21,6 +27,14 @@ provisioner:
   name: ansible
   options:
     vvv: true
+  inventory:
+    hosts:
+      all:
+        hosts:
+          ubi8:
+            ansible_python_interpreter: /usr/bin/python3
+        vars:
+          ansible_user: root
   log: true
   env:
     ANSIBLE_STDOUT_CALLBACK: yaml
diff --git a/roles/check_undercloud_conf/molecule/config_OK/prepare.yml b/roles/check_undercloud_conf/molecule/config_OK/prepare.yml
index a5ee06538..97c7df874 100644
--- a/roles/check_undercloud_conf/molecule/config_OK/prepare.yml
+++ b/roles/check_undercloud_conf/molecule/config_OK/prepare.yml
@@ -26,6 +26,7 @@
           - '!any'
           - '!min'
           - env
+
     - name: populate undercloud.conf
       copy:
         dest: "{{ ansible_env.HOME }}/undercloud.conf"
diff --git a/roles/check_undercloud_conf/molecule/default/Dockerfile.j2 b/roles/check_undercloud_conf/molecule/default/Dockerfile
similarity index 100%
rename from roles/check_undercloud_conf/molecule/default/Dockerfile.j2
rename to roles/check_undercloud_conf/molecule/default/Dockerfile
diff --git a/roles/check_undercloud_conf/molecule/default/molecule.yml b/roles/check_undercloud_conf/molecule/default/molecule.yml
index e1873b35e..28b449b6d 100644
--- a/roles/check_undercloud_conf/molecule/default/molecule.yml
+++ b/roles/check_undercloud_conf/molecule/default/molecule.yml
@@ -5,12 +5,18 @@ driver:
 log: true
 
 platforms:
-  - name: centos8
-    hostname: centos8
-    image: centos:8
-    pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release iputils python*-PyYAML
+  - name: ubi8
+    hostname: ubi8
+    image: ubi8/ubi-init
+    registry:
+      url: registry.access.redhat.com
+    dockerfile: Dockerfile
+    pkg_extras: python*-setuptools python*-pyyaml
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
+      - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
+      - /opt/yum.repos.d:/etc/yum.repos.d:rw
+    privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
@@ -21,6 +27,14 @@ provisioner:
   name: ansible
   options:
     vvv: true
+  inventory:
+    hosts:
+      all:
+        hosts:
+          ubi8:
+            ansible_python_interpreter: /usr/bin/python3
+        vars:
+          ansible_user: root
   log: true
   env:
     ANSIBLE_STDOUT_CALLBACK: yaml
diff --git a/roles/check_undercloud_conf/molecule/default/prepare.yml b/roles/check_undercloud_conf/molecule/default/prepare.yml
index 5ed29daf9..72ce14cc0 100644
--- a/roles/check_undercloud_conf/molecule/default/prepare.yml
+++ b/roles/check_undercloud_conf/molecule/default/prepare.yml
@@ -25,6 +25,7 @@
           - '!any'
           - '!min'
           - env
+
     - name: populate undercloud.conf
       copy:
         dest: "{{ ansible_env.HOME }}/undercloud.conf"
diff --git a/roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile.j2 b/roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile
similarity index 100%
rename from roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile.j2
rename to roles/check_undercloud_conf/molecule/deprecated_drivers/Dockerfile
diff --git a/roles/check_undercloud_conf/molecule/deprecated_drivers/molecule.yml b/roles/check_undercloud_conf/molecule/deprecated_drivers/molecule.yml
index e1873b35e..28b449b6d 100644
--- a/roles/check_undercloud_conf/molecule/deprecated_drivers/molecule.yml
+++ b/roles/check_undercloud_conf/molecule/deprecated_drivers/molecule.yml
@@ -5,12 +5,18 @@ driver:
 log: true
 
 platforms:
-  - name: centos8
-    hostname: centos8
-    image: centos:8
-    pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release iputils python*-PyYAML
+  - name: ubi8
+    hostname: ubi8
+    image: ubi8/ubi-init
+    registry:
+      url: registry.access.redhat.com
+    dockerfile: Dockerfile
+    pkg_extras: python*-setuptools python*-pyyaml
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
+      - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
+      - /opt/yum.repos.d:/etc/yum.repos.d:rw
+    privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
@@ -21,6 +27,14 @@ provisioner:
   name: ansible
   options:
     vvv: true
+  inventory:
+    hosts:
+      all:
+        hosts:
+          ubi8:
+            ansible_python_interpreter: /usr/bin/python3
+        vars:
+          ansible_user: root
   log: true
   env:
     ANSIBLE_STDOUT_CALLBACK: yaml
diff --git a/roles/check_undercloud_conf/molecule/deprecated_drivers/prepare.yml b/roles/check_undercloud_conf/molecule/deprecated_drivers/prepare.yml
index 37f68560f..9df3264c7 100644
--- a/roles/check_undercloud_conf/molecule/deprecated_drivers/prepare.yml
+++ b/roles/check_undercloud_conf/molecule/deprecated_drivers/prepare.yml
@@ -26,6 +26,7 @@
           - '!any'
           - '!min'
           - env
+
     - name: populate undercloud.conf
       copy:
         dest: "{{ ansible_env.HOME }}/undercloud.conf"
diff --git a/roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile.j2 b/roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile
similarity index 100%
rename from roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile.j2
rename to roles/check_undercloud_conf/molecule/deprecated_params/Dockerfile
diff --git a/roles/check_undercloud_conf/molecule/deprecated_params/molecule.yml b/roles/check_undercloud_conf/molecule/deprecated_params/molecule.yml
index e1873b35e..28b449b6d 100644
--- a/roles/check_undercloud_conf/molecule/deprecated_params/molecule.yml
+++ b/roles/check_undercloud_conf/molecule/deprecated_params/molecule.yml
@@ -5,12 +5,18 @@ driver:
 log: true
 
 platforms:
-  - name: centos8
-    hostname: centos8
-    image: centos:8
-    pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release iputils python*-PyYAML
+  - name: ubi8
+    hostname: ubi8
+    image: ubi8/ubi-init
+    registry:
+      url: registry.access.redhat.com
+    dockerfile: Dockerfile
+    pkg_extras: python*-setuptools python*-pyyaml
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
+      - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
+      - /opt/yum.repos.d:/etc/yum.repos.d:rw
+    privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
@@ -21,6 +27,14 @@ provisioner:
   name: ansible
   options:
     vvv: true
+  inventory:
+    hosts:
+      all:
+        hosts:
+          ubi8:
+            ansible_python_interpreter: /usr/bin/python3
+        vars:
+          ansible_user: root
   log: true
   env:
     ANSIBLE_STDOUT_CALLBACK: yaml
diff --git a/roles/check_undercloud_conf/molecule/deprecated_params/prepare.yml b/roles/check_undercloud_conf/molecule/deprecated_params/prepare.yml
index a47273aef..fdaca9a1c 100644
--- a/roles/check_undercloud_conf/molecule/deprecated_params/prepare.yml
+++ b/roles/check_undercloud_conf/molecule/deprecated_params/prepare.yml
@@ -26,6 +26,7 @@
           - '!any'
           - '!min'
           - env
+
     - name: populate undercloud.conf
       copy:
         dest: "{{ ansible_env.HOME }}/undercloud.conf"
diff --git a/roles/check_undercloud_conf/molecule/required_missing/Dockerfile.j2 b/roles/check_undercloud_conf/molecule/required_missing/Dockerfile
similarity index 100%
rename from roles/check_undercloud_conf/molecule/required_missing/Dockerfile.j2
rename to roles/check_undercloud_conf/molecule/required_missing/Dockerfile
diff --git a/roles/check_undercloud_conf/molecule/required_missing/molecule.yml b/roles/check_undercloud_conf/molecule/required_missing/molecule.yml
index e1873b35e..28b449b6d 100644
--- a/roles/check_undercloud_conf/molecule/required_missing/molecule.yml
+++ b/roles/check_undercloud_conf/molecule/required_missing/molecule.yml
@@ -5,12 +5,18 @@ driver:
 log: true
 
 platforms:
-  - name: centos8
-    hostname: centos8
-    image: centos:8
-    pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby epel-release iputils python*-PyYAML
+  - name: ubi8
+    hostname: ubi8
+    image: ubi8/ubi-init
+    registry:
+      url: registry.access.redhat.com
+    dockerfile: Dockerfile
+    pkg_extras: python*-setuptools python*-pyyaml
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
+      - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
+      - /opt/yum.repos.d:/etc/yum.repos.d:rw
+    privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
@@ -21,6 +27,14 @@ provisioner:
   name: ansible
   options:
     vvv: true
+  inventory:
+    hosts:
+      all:
+        hosts:
+          ubi8:
+            ansible_python_interpreter: /usr/bin/python3
+        vars:
+          ansible_user: root
   log: true
   env:
     ANSIBLE_STDOUT_CALLBACK: yaml
diff --git a/roles/check_undercloud_conf/molecule/required_missing/prepare.yml b/roles/check_undercloud_conf/molecule/required_missing/prepare.yml
index db8cc2928..54951b878 100644
--- a/roles/check_undercloud_conf/molecule/required_missing/prepare.yml
+++ b/roles/check_undercloud_conf/molecule/required_missing/prepare.yml
@@ -26,6 +26,7 @@
           - '!any'
           - '!min'
           - env
+
     - name: populate undercloud.conf
       copy:
         dest: "{{ ansible_env.HOME }}/undercloud.conf"
diff --git a/roles/check_undercloud_conf/tasks/main.yml b/roles/check_undercloud_conf/tasks/main.yml
index c3893f550..e627f8bcb 100644
--- a/roles/check_undercloud_conf/tasks/main.yml
+++ b/roles/check_undercloud_conf/tasks/main.yml
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+
 - name: Ensure we get needed facts
   setup:
     gather_subset:
@@ -21,6 +22,7 @@
       - '!any'
       - '!min'
       - env
+
 # "check_undercloud_conf" tasks
 - name: "Retrieve {{ ansible_env.HOME }}/undercloud.conf content"
   slurp: