diff --git a/playbooks/openvswitch.yml b/playbooks/openvswitch.yml
index 578a5bd..7d5d091 100644
--- a/playbooks/openvswitch.yml
+++ b/playbooks/openvswitch.yml
@@ -3,35 +3,6 @@
   vars:
     ansible_become: true
   tasks:
-    # Workaround for:
-    # http://mirror.ord.rax.opendev.org/epel/7/SRPMS/repodata/repomd.xml: [Errno 14] HTTP Error 404 - Not Found
-    # See: https://zuul.opendev.org/t/openstack/build/1fa5b2f895c54e7a81a064a2fff5f838/log/centos-7/ansible/tenks-deploy#501
-    - block:
-        - name: Install epel release
-          package:
-            name: epel-release
-
-        - name: Switch the broken mirror
-          ini_file:
-            path: /etc/yum.repos.d/epel.repo
-            section: epel-source
-            option: baseurl
-            value: http://download.fedoraproject.org/pub/epel/$releasever/SRPMS/
-
-        - name: Make sure metalink does not exist
-          ini_file:
-            path: /etc/yum.repos.d/epel.repo
-            section: epel-source
-            option: metalink
-            state: absent
-
-        - name: Install Open vSwitch
-          include_role:
-            name: fkautz.openvswitch-install
-      when:
-        - ansible_facts.os_family == "RedHat"
-        - ansible_facts.distribution_major_version is version(8, '<')
-
     - block:
         - name: Install the Delorean repositories
           get_url:
@@ -51,7 +22,6 @@
             state: started
       when:
         - ansible_facts.os_family == "RedHat"
-        - ansible_facts.distribution_major_version is version(8, '>=')
 
     - block:
         - name: Install packages
@@ -69,4 +39,3 @@
             name: openvswitch-switch
             state: started
       when: ansible_facts.os_family == "Debian"
-
diff --git a/playbooks/tenks-deploy-teardown/templates/requirements-overrides.yml.j2 b/playbooks/tenks-deploy-teardown/templates/requirements-overrides.yml.j2
index b94648b..df7bbca 100644
--- a/playbooks/tenks-deploy-teardown/templates/requirements-overrides.yml.j2
+++ b/playbooks/tenks-deploy-teardown/templates/requirements-overrides.yml.j2
@@ -8,7 +8,3 @@
 
 - src: git+{{ stackhpc_libvirt_vm_src_dir }}/.git
   name: stackhpc.libvirt-vm
-
-# Roles for CI only
-- src: https://github.com/stackhpc/ansible-roles-openvswitch-install
-  name: fkautz.openvswitch-install