diff --git a/tasks/qdrouterd_install_dnf.yml b/tasks/qdrouterd_install_dnf.yml
new file mode 120000
index 0000000..3c0b455
--- /dev/null
+++ b/tasks/qdrouterd_install_dnf.yml
@@ -0,0 +1 @@
+qdrouterd_install_yum.yml
\ No newline at end of file
diff --git a/vars/redhat.yml b/vars/redhat.yml
index c643183..6cc4791 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -15,7 +15,7 @@
 
 qdrouterd_distro_packages:
   - openssl
-  - python-qpid-proton
+  - "{{ ansible_distribution_major_version is version('8', '<') | ternary('python-qpid-proton', 'python3-qpid-proton') }}"
   - cyrus-sasl-lib
   - cyrus-sasl-plain
   - cyrus-sasl-md5
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index da8fc64..5357724 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 qdrouterd_distro_packages:
-  - python-qpid-proton
+  - python3-qpid-proton
   - libsasl2-modules
   - sasl2-bin
   - qdrouterd
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f00fccd..536c5cf 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -21,7 +21,9 @@
       jobs:
         - openstack-ansible-linters
         - openstack-ansible-functional-centos-7
+        - openstack-ansible-functional-centos-8
         - openstack-ansible-functional-ubuntu-bionic
+        - openstack-ansible-functional-ubuntu-focal
     experimental:
       jobs:
         - openstack-ansible-integrated-deploy-aio
@@ -29,4 +31,6 @@
       jobs:
         - openstack-ansible-linters
         - openstack-ansible-functional-centos-7
+        - openstack-ansible-functional-centos-8
         - openstack-ansible-functional-ubuntu-bionic
+        - openstack-ansible-functional-ubuntu-focal