diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
index 4ebd22e573..a2f0f8334a 100644
--- a/.zuul.d/centos.yaml
+++ b/.zuul.d/centos.yaml
@@ -17,9 +17,18 @@
               - ^setup.cfg$
               - ^setup.py$
         - kolla-ansible-bifrost-centos-source:
-            files: ^docker\/bifrost\/.*
+            files: ^docker\/(base|bifrost|openstack-base)\/.*
+        # Test rabbitmq & mariadb changes in multinode ceph jobs.
         - kolla-ansible-centos-source-ceph:
-            files: ^docker\/(ceph|cinder)\/.*
+            files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+        - kolla-ansible-centos-source-upgrade-ceph:
+            files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+        - kolla-ansible-centos-source-cinder-lvm:
+            files: ^docker\/(base|cinder|iscsid|openstack-base)\/.*
+        - kolla-ansible-centos-source-scenario-nfv:
+            files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.*
+        - kolla-ansible-centos-source-ironic:
+            files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
     gate:
       jobs:
         - kolla-build-centos-source
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
index 9d9e4e1601..d093bf335a 100644
--- a/.zuul.d/ubuntu.yaml
+++ b/.zuul.d/ubuntu.yaml
@@ -8,9 +8,16 @@
         - kolla-ansible-ubuntu-binary
         - kolla-ansible-ubuntu-source-upgrade
         - kolla-ansible-ubuntu-source-zun:
-            files: ^docker\/(zun|kuryr)\/.*
+            files: ^docker\/(base|zun|kuryr|openstack-base)\/.*
+        # Test rabbitmq and mariadb in multinode ceph jobs.
         - kolla-ansible-ubuntu-source-ceph:
-            files: ^docker\/(ceph|cinder)\/.*
+            files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+        - kolla-ansible-ubuntu-source-upgrade-ceph:
+            files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
+        - kolla-ansible-ubuntu-source-cinder-lvm:
+            files: ^docker\/(base|cinder|iscsid|openstack-base)\/.*
+        - kolla-ansible-ubuntu-source-ironic:
+            files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
     gate:
       jobs:
         - kolla-build-ubuntu-source