diff --git a/vars/redhat.yml b/vars/redhat.yml
index 504f086..46293ff 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -29,7 +29,7 @@ manila_service_distro_packages:
   - openstack-manila
   - python-manilaclient
   - python2-shade
-  - systemd-python
+  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}"
   - uwsgi
   - uwsgi-python
 
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 2c8f6a3..13d708d 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -22,10 +22,10 @@
     check:
       jobs:
         - openstack-ansible-deploy-aio_metal-ubuntu-bionic
-        - openstack-ansible-deploy-aio_metal-centos-7
+        - openstack-ansible-deploy-aio_metal-centos-8
         - openstack-ansible-deploy-aio_lxc-ubuntu-bionic:
             voting: false
     gate:
       jobs:
         - openstack-ansible-deploy-aio_metal-ubuntu-bionic
-        - openstack-ansible-deploy-aio_metal-centos-7
+        - openstack-ansible-deploy-aio_metal-centos-8