diff --git a/test-ansible-collection-requirements.yml b/test-ansible-collection-requirements.yml
index 0482aac4..2e8be1af 100644
--- a/test-ansible-collection-requirements.yml
+++ b/test-ansible-collection-requirements.yml
@@ -24,3 +24,6 @@ collections:
   - name: openvswitch.openvswitch
     version: 2.0.2
     source: https://galaxy.ansible.com
+  - name: https://opendev.org/openstack/openstack-ansible-plugins
+    version: master
+    type: git
\ No newline at end of file
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ef7cad6f..586b66f4 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -130,16 +130,9 @@
     nodeset: ubuntu-focal
 
 - job:
-    name: openstack-ansible-functional-centos-8
+    name: openstack-ansible-functional-centos-8-stream
     parent: openstack-ansible-functional
-    nodeset: centos-8
-
-- job:
-    name: openstack-ansible-functional-distro_install-centos-8
-    parent: openstack-ansible-functional
-    nodeset: centos-8
-    vars:
-      tox_env: distro_install
+    nodeset: centos-8-stream
 
 - job:
     name: openstack-ansible-cross-repo-functional
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index d1aadc7e..a1731e83 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -13,7 +13,7 @@
     check:
       jobs:
         - openstack-ansible-functional-debian-buster
-        - openstack-ansible-functional-centos-8
+        - openstack-ansible-functional-centos-8-stream
         - openstack-ansible-functional-ubuntu-focal
     gate:
       jobs:
@@ -31,11 +31,3 @@
       jobs:
         - openstack-ansible-upgrade-ubuntu-focal
 
-- project-template:
-    name: openstack-ansible-role-distro_install-jobs
-    check:
-      jobs:
-        - openstack-ansible-functional-distro_install-centos-8
-    gate:
-      jobs:
-        - openstack-ansible-functional-distro_install-centos-8