diff --git a/playbooks/healthcheck-infrastructure.yml b/playbooks/healthcheck-infrastructure.yml
index 4680f90b4a..274845b10a 100644
--- a/playbooks/healthcheck-infrastructure.yml
+++ b/playbooks/healthcheck-infrastructure.yml
@@ -23,6 +23,8 @@
 - name: Ensure all repo-servers are built and are accessible by hosts.
   hosts: all_containers[0]:physical_hosts[0]
   gather_facts: yes
+  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
   vars:
     repo_requirements_file: "{{ 'constraints/upper_constraints_' ~ requirements_git_install_branch ~ '.txt' }}"
   tasks:
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9bfd7144ee..dbff67e2b9 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -260,6 +260,18 @@
       - ^ansible-role-requirements\.yml
       - ^playbooks\/defaults\/repo_packages\/.*\.yml
 
+# Ensuring clustering and healthcheck-infrastructure playbook is valid
+- job:
+    name: openstack-ansible-deploy-infra_lxc-validate
+    parent: openstack-ansible-deploy-infra_lxc-ubuntu-focal
+    files:
+      - ^playbooks\/galera-install.yml
+      - ^playbooks\/rabbitmq-install.yml
+      - ^playbooks\/memcached-install.yml
+      - ^playbooks\/healthcheck-infrastructure.yml
+      - ^playbooks\/repo-install.yml
+      - ^playbooks\/haproxy-install.yml
+
 # Running linters check
 - job:
     name: openstack-ansible-linters-ubuntu-focal
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index ec5100cd89..aca52e5ff8 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -18,11 +18,13 @@
       jobs:
         - openstack-ansible-varstest-aio
         - openstack-ansible-shastest-metal
+        - openstack-ansible-deploy-infra_lxc-validate
         - openstack-tox-docs
     gate:
       jobs:
         - openstack-ansible-varstest-aio
         - openstack-ansible-shastest-metal
+        - openstack-ansible-deploy-infra_lxc-validate
         - openstack-tox-docs
     periodic:
       jobs: