diff --git a/roles/multi-node-bridge/tasks/common.yaml b/roles/multi-node-bridge/tasks/common.yaml
index 6931d5cf5..a54b50081 100644
--- a/roles/multi-node-bridge/tasks/common.yaml
+++ b/roles/multi-node-bridge/tasks/common.yaml
@@ -12,7 +12,7 @@
 # from installing repositories we don't need.
 - when:
     - ansible_os_family == "RedHat"
-    - ansible_distribution != "Fedora"
+    - ansible_distribution not in ["Fedora", "RedHat"]
   become: yes
   block:
     - name: Set up RDO GPG key
diff --git a/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2 b/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2
index 7ebf73ed9..ea6ed7b72 100644
--- a/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2
+++ b/roles/multi-node-bridge/templates/zuul-multi-node-bridge-ovs.repo.j2
@@ -1,5 +1,5 @@
 # Vendored from rdo-release: https://github.com/rdo-infra/rdo-release
-{% if ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int <= 7 %}
+{% if ansible_distribution_major_version|int <= 7 %}
 [centos-openstack-queens]
 name=CentOS OpenStack Queens Repository
 {% if zuul_site_mirror_fqdn is defined %}
@@ -10,7 +10,7 @@ baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-queens/
 gpgcheck=1
 enabled=1
 gpgkey=file:///tmp/RPM-GPG-KEY-CentOS-SIG-Cloud
-{% elif ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int == 8 %}
+{% elif ansible_distribution_major_version|int == 8 %}
 [RDO-CentOS8-deps]
 name=CentOS OpenStack Train Repository
 {% if zuul_site_mirror_fqdn is defined %}
@@ -22,7 +22,7 @@ gpgcheck=0
 enabled=1
 # TODO: Replace testing repo once C9 released repos as available. Currently Centos9 stream release
 # repos are not available so need to use testing repo available at buildlogs.centos.org.
-{% elif ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int == 9 %}
+{% elif ansible_distribution_major_version|int == 9 %}
 [RDO-CentOS9-stream-deps]
 name=CentOS OpenStack Xena Repository
 {% if zuul_site_mirror_fqdn is defined %}