diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 6565a74556..0cfa4f1c5e 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -61,7 +61,10 @@ virtual_machines:
     families:
       - rhel-8-4-sap-ha
       - rhel-8-6-sap-ha
-    container_engine: podman
+    # RHEL SAP 8.4 seems to have an older version of podman that
+    # fails with our integration tests, so we stick with docker
+    # for now.
+    container_engine: docker
 
   rhcos:
     project: rhcos-cloud
diff --git a/ansible/roles/provision-vm/tasks/redhat.yml b/ansible/roles/provision-vm/tasks/redhat.yml
index edf7dea549..43bee28f48 100644
--- a/ansible/roles/provision-vm/tasks/redhat.yml
+++ b/ansible/roles/provision-vm/tasks/redhat.yml
@@ -26,7 +26,7 @@
 - name: Disable troublesome repo
   ansible.builtin.shell: |
     dnf config-manager --disable rhui-codeready-builder-for-rhel-8-x86_64-rhui-source-rpms
-  when: vm_config.find('-8') != -1 and vm_arch == 'amd64'
+  when: vm_image_family == 'rhel-8'
 
 - name: Install needed utilities
   ansible.builtin.dnf: