diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index a439e7dadab2b6998ee18934318c3717e2f331e6..e400c0f1856b5dd8d9ecbb8497ed48a84ba91945 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -80,6 +80,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/(nova-cell)/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/templates/nova-compute-overrides.j2
     vars:
       virt_type: kvm
@@ -106,6 +107,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/bifrost/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-bifrost.sh
     vars:
       scenario: bifrost
@@ -118,6 +120,7 @@
       - ^requirements-core.yml
       - ^ansible/roles/(ironic|neutron|nova|nova-cell)/
       - ^tests/deploy-tenks\.sh$
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/templates/ironic-overrides\.j2$
       - ^tests/templates/tenks-deploy-config\.yml\.j2$
       - ^tests/test-dashboard\.sh$
@@ -135,6 +138,7 @@
       - ^requirements-core.yml
       - ^ansible/roles/(zun|kuryr|etcd|cinder|iscsi)/
       - ^tests/setup_disks.sh
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-core-openstack.sh
       - ^tests/test-zun.sh
       - ^tests/test-dashboard.sh
@@ -150,6 +154,7 @@
       - ^ansible/roles/(glance|swift)/
       - ^tests/setup_disks.sh
       - ^tests/init-swift.sh
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-core-openstack.sh
       - ^tests/test-dashboard.sh
       - ^tests/test-swift.sh
@@ -170,6 +175,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/(designate|magnum|trove)/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-dashboard.sh
       - ^tests/test-magnum.sh
     vars:
@@ -182,6 +188,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/(octavia|octavia-certificates)/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-dashboard.sh
       - ^tests/test-octavia.sh
     vars:
@@ -195,6 +202,7 @@
       - ^requirements-core.yml
       - ^ansible/roles/masakari/
       - ^ansible/roles/hacluster/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-masakari.sh
       - ^tests/test-dashboard.sh
     vars:
@@ -207,6 +215,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/mariadb/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-mariadb.sh
     vars:
       scenario: mariadb
@@ -218,6 +227,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/(aodh|barbican|heat|mistral|redis|tacker)/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-scenario-nfv.sh
       - ^tests/test-dashboard.sh
     vars:
@@ -230,6 +240,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/nova/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-core-openstack.sh
     vars:
       scenario: cells
@@ -241,6 +252,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/(neutron|octavia|openvswitch|ovn-controller|ovn-db)/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-ovn.sh
       - ^tests/test-core-openstack.sh
       - ^tests/reconfigure.sh
@@ -254,6 +266,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/(common|opensearch|grafana|prometheus)/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-prometheus-opensearch.sh
     vars:
       scenario: prometheus-opensearch
@@ -265,6 +278,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/(common|opensearch|venus)/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-venus.sh
     vars:
       scenario: venus
@@ -281,6 +295,7 @@
       - ^requirements-core.yml
       - ^kolla_ansible/
       - ^tests/run-hashi-vault.yml
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-hashicorp-vault-passwords.sh
 
 - job:
@@ -290,6 +305,7 @@
     files:
       - ^ansible/roles/haproxy/
       - ^kolla_ansible/kolla_url.py
+      - ^tests/templates/(inventory|globals-default.j2)
     vars:
       external_api_interface_name: vxlan2
       external_api_network_prefix: "192.0.3."
@@ -304,8 +320,8 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/common/templates/conf/input/11-letsencrypt.conf.j2
-      - ^ansible/roles/letsencrypt/
-      - ^ansible/roles/loadbalancer/
+      - ^ansible/roles/(letsencrypt|loadbalancer)/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-core-openstack.sh
       - ^tests/test-dashboard.sh
       - ^tests/deploy.sh
@@ -321,6 +337,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/skyline/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-skyline.sh
     vars:
       scenario: skyline
@@ -332,6 +349,7 @@
     files:
       - ^requirements-core.yml
       - ^ansible/roles/skyline/
+      - ^tests/templates/(inventory|globals-default.j2)
       - ^tests/test-skyline-sso.sh
     vars:
       scenario: skyline-sso