diff --git a/vars/redhat-7.yml b/vars/redhat.yml
similarity index 84%
rename from vars/redhat-7.yml
rename to vars/redhat.yml
index ca509187..bb516882 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat.yml
@@ -23,7 +23,6 @@ nova_distro_packages:
   - genisoimage
   - git
   - iptables
-  - python-openstackclient
 
 nova_devel_distro_packages:
   - libxml2-devel
@@ -67,17 +66,17 @@ nova_compute_kvm_distro_packages:
   - libvirt-daemon-driver-qemu
   - libvirt-client
   - nc
-  - qemu-kvm-ev
+  - "qemu-kvm{% if ansible_distribution_major_version|int <= 7 %}-ev{% endif %}"
   - libvirt-python
   - nfs-utils
   - python-libguestfs
-  - qemu-img-ev
+  - "qemu-img{% if ansible_distribution_major_version|int <= 7 %}-ev{% endif %}"
   - sysfsutils
   - "{{ (ansible_architecture == 'aarch64') | ternary('AAVMF', 'OVMF') }}"
 
 nova_compute_kvm_packages_to_symlink:
-  - libvirt-python
-  - python-libguestfs
+  - "{% if ansible_distribution_major_version|int <= 7 %}libvirt-python{% else %}python2-libvirt{% endif %}"
+  - "python{% if ansible_distribution_major_version|int > 7 %}2{% endif %}-libguestfs"
 
 nova_compute_ksm_packages:
   - ksmtuned