diff --git a/setup.cfg b/setup.cfg
index 1372a0ccc..64461049c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,9 +22,9 @@ setup-hooks =
 [files]
 data_files =
     share/ansible/tripleo-playbooks/ = tripleo_ansible/playbooks/*
-    share/ansible/plugins/ = tripleo_ansible/ansible_plugins/*
-    share/ansible/roles/ = tripleo_ansible/roles/*
-    share/ansible/roles/tripleo-docker-rm/ = tripleo_ansible/roles/tripleo-docker-rm/*
+    share/ansible/tripleo-plugins/ = tripleo_ansible/ansible_plugins/*
+    share/ansible/tripleo-roles/ = tripleo_ansible/roles/*
+    share/ansible/tripleo-roles/tripleo-docker-rm/ = tripleo_ansible/roles/tripleo-docker-rm/*
 
 [wheel]
 universal = 1
diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml
index 594df6a11..1a92f0fac 100644
--- a/zuul.d/playbooks/pre.yml
+++ b/zuul.d/playbooks/pre.yml
@@ -12,6 +12,7 @@
           - "{{ tripleo_ansible_project_path }}/tripleo_ansible/roles.galaxy/config_template/action"
           - "{{ tripleo_ansible_project_path }}/tripleo_ansible/ansible_plugins/action"
           - "/usr/share/ansible/plugins/action"
+          - "/usr/share/ansible/tripleo-plugins/action"
 
     - name: Ensure output dirs
       file:
diff --git a/zuul.d/playbooks/run.yml b/zuul.d/playbooks/run.yml
index 1ced4073e..2cf19031f 100644
--- a/zuul.d/playbooks/run.yml
+++ b/zuul.d/playbooks/run.yml
@@ -14,6 +14,7 @@
           - "{{ tripleo_ansible_project_path }}/tripleo_ansible/roles.galaxy/config_template/action"
           - "{{ tripleo_ansible_project_path }}/tripleo_ansible/ansible_plugins/action"
           - "/usr/share/ansible/plugins/action"
+          - "/usr/share/ansible/tripleo-plugins/action"
   tasks:
     - name: Run role test job
       shell: |-