diff --git a/vars/redhat-7.yml b/vars/redhat.yml
similarity index 71%
rename from vars/redhat-7.yml
rename to vars/redhat.yml
index bcc96f27..ed39ad32 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat.yml
@@ -19,7 +19,7 @@ swift_distro_packages:
   - liberasurecode
   - openssh-server
   - openssh-clients
-  - rsync
+  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('rsync', 'rsync-daemon') }}"
 
 swift_devel_distro_packages:
   - git
@@ -30,9 +30,9 @@ swift_devel_distro_packages:
 
 swift_service_distro_packages:
   - openstack-swift
-  - python-keystonemiddleware
-  - python-memcached
-  - python-swift
+  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('python-keystonemiddleware', 'python3-keystonemiddleware') }}"
+  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('python-memcached', 'python3-memcached') }}"
+  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('python-swift', 'python3-swift') }}"
 
 swift_account_distro_packages:
   - openstack-swift-account