diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio.j2 b/etc/openstack_deploy/openstack_user_config.yml.aio.j2
index 12e22a0c63..baeee8e974 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.aio.j2
+++ b/etc/openstack_deploy/openstack_user_config.yml.aio.j2
@@ -134,6 +134,12 @@ shared-infra_hosts:
     container_vars:
       # Optional | container_tech for a target host, default is "lxc".
       container_tech: "{{ bootstrap_host_container_tech }}"
+{% if 'infra' in bootstrap_host_scenarios_expanded %}
+    affinity:
+      galera_container: 3
+      memcached_container: 3
+      rabbit_mq_container: 3
+{% endif %}
 
 repo-infra_hosts:
   aio1:
diff --git a/playbooks/healthcheck-infrastructure.yml b/playbooks/healthcheck-infrastructure.yml
index 485f6ebc19..82f4b3f97b 100644
--- a/playbooks/healthcheck-infrastructure.yml
+++ b/playbooks/healthcheck-infrastructure.yml
@@ -24,7 +24,7 @@
   hosts: all_containers[0]:physical_hosts[0]
   gather_facts: yes
   vars:
-    repo_requirements_file: "os-releases/{{ openstack_release }}/{{ os_distro_version }}/requirements_constraints.txt"
+    repo_requirements_file: "os-releases/{{ openstack_release }}/{{ os_distro_version }}/"
   tasks:
     - name: Check the upper constraint on each repo server
       uri:
@@ -50,7 +50,7 @@
       when: groups['haproxy'] | length > 1
 
     - package:
-        name: "{% if ansible_distribution | lower == 'centos' %}nc{% elif ansible_distribution | lower == 'suse' %}netcat-openbsd{% else %}netcat{% endif %}"
+        name: "{% if ansible_os_family | lower == 'redhat' %}nmap-ncat{% else %}netcat-openbsd{% endif %}"
         state: present
 
     # Fails if HAProxy is not running
@@ -85,7 +85,7 @@
     # Repo release path points to the internal LB vip
     - name: Check the presence of upper constraints on your repos and check load balancing
       uri:
-        url: "{{ repo_release_path }}/requirements_constraints.txt"
+        url: "{{ repo_release_path }}/"
   tags:
     - healthcheck
     - healthcheck-repo-use
@@ -94,6 +94,10 @@
 - name: Ensure the service setup host is ready to run openstack calls
   hosts: "{{ openstack_service_setup_host | default('localhost') }}"
   gather_facts: no
+  vars_files:
+    - "defaults/{{ install_method }}_install.yml"
+  vars:
+    ansible_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default(ansible_python['executable']) }}"
   tasks:
     - name: Get openstack client config
       openstack.cloud.os_client_config:
@@ -117,7 +121,7 @@
       with_items: "{{ groups['memcached'] }}"
 
     - package:
-        name: netcat
+        name: "{% if ansible_os_family | lower == 'redhat' %}nmap-ncat{% else %}netcat-openbsd{% endif %}"
         state: present
 
     - name: Connect to remote memcache servers (full mesh testing)
@@ -150,18 +154,146 @@
     - healthcheck
     - healthcheck-galera-install
 
+- name: Run functional tests
+  hosts: galera_all
+  user: root
+  gather_facts: true
+  tasks:
+    - name: Wait for cluster to be ready
+      block:
+        - name: Wait for cluster ready state
+          command: |
+            mysql -h {{ ansible_host }} \
+                  -p"{{ galera_root_password }}" \
+                  -e "show status like 'wsrep_incoming_addresses';" \
+                  --silent \
+                  --skip-column-names
+          register: mysql_instance_ready
+          retries: 20
+          delay: 5
+          changed_when: false
+          until: mysql_instance_ready is success and mysql_instance_ready.stdout.split()[-1].split(',') | length == groups['galera_all'] | length
+      rescue:
+        - name: Restarting weird maria instance
+          service:
+            name: mariadb
+            state: restarted
+        - name: Wait for cluster ready state
+          command: |
+            mysql -h {{ ansible_host }} \
+                  -p"{{ galera_root_password }}" \
+                  -e "show status like 'wsrep_incoming_addresses';" \
+                  --silent \
+                  --skip-column-names
+          register: mysql_instance_ready
+          retries: 20
+          delay: 5
+          changed_when: false
+          until: mysql_instance_ready is success and mysql_instance_ready.stdout.split()[-1].split(',') | length == groups['galera_all'] | length
+
+    - name: Check cluster local state
+      command: |
+        mysql -h {{ ansible_host }} \
+              -p"{{ galera_root_password }}" \
+              -e "show status like 'wsrep_local_state_comment';" \
+              --silent \
+              --skip-column-names
+      register: wsrep_local_state_comment
+      changed_when: false
+      tags:
+        - skip_ansible_lint
+
+    - name: Check cluster evs state
+      command: |
+        mysql -h {{ ansible_host }} \
+              -p"{{ galera_root_password }}" \
+              -e "show status like 'wsrep_evs_state';" \
+              --silent \
+              --skip-column-names
+      register: wsrep_evs_state
+      changed_when: false
+      tags:
+        - skip_ansible_lint
+
+    - name: Check contents
+      assert:
+        that:
+          - "'Synced' in wsrep_local_state_comment.stdout"
+          - "'OPERATIONAL' in wsrep_evs_state.stdout"
+
+    - name: Create DB for service on "{{ groups['galera_all'][0] }}"
+      community.mysql.mysql_db:
+        login_user: "{{ galera_root_user | default('root') }}"
+        login_password: "{{ galera_root_password }}"
+        login_host: "{{ ansible_host }}"
+        name: "OSA-test"
+        state: "present"
+      when: inventory_hostname == groups['galera_all'][0]
+      tags:
+        - skip_ansible_lint
+
+    - name: Grant access to the DB on "{{ groups['galera_all'][-1] }}"
+      community.mysql.mysql_user:
+        login_user: "{{ galera_root_user | default('root') }}"
+        login_password: "{{ galera_root_password }}"
+        login_host: "{{ ansible_host }}"
+        name: "osa-tester"
+        password: "tester-secrete"
+        host: "{{ item }}"
+        state: "present"
+        priv: "OSA-test.*:ALL"
+      with_items:
+        - "localhost"
+        - "%"
+      when: inventory_hostname == groups['galera_all'][-1]
+
+    - name: Try to login with user to DB
+      delegate_to: "{{ groups['utility_all'][0] }}"
+      command: |
+        mysql -h {{ internal_lb_vip_address }} \
+              -p"tester-secrete" \
+              -u osa-tester \
+              OSA-test \
+              -e "SHOW TABLES;"
+      when: inventory_hostname == groups['galera_all'][-1]
+
+    - name: Remove created user
+      community.mysql.mysql_user:
+        login_user: "{{ galera_root_user | default('root') }}"
+        login_password: "{{ galera_root_password }}"
+        login_host: "{{ ansible_host }}"
+        name: "osa-tester"
+        state: "absent"
+        host: "{{ item }}"
+      with_items:
+        - "localhost"
+        - "%"
+      when: inventory_hostname == groups['galera_all'][-1]
+
+    - name: Remove created DB
+      community.mysql.mysql_db:
+        login_user: "{{ galera_root_user | default('root') }}"
+        login_password: "{{ galera_root_password }}"
+        login_host: "{{ ansible_host }}"
+        name: "OSA-test"
+        state: "absent"
+      when: inventory_hostname == groups['galera_all'][0]
+      tags:
+        - skip_ansible_lint
+
+
 # Test rabbitmq-install.yml
 - name: Add a user for rabbitmq
   hosts: rabbitmq_all[0]
   gather_facts: no
   tasks:
     - name: Configure Rabbitmq vhost
-      rabbitmq_vhost:
+      community.rabbitmq.rabbitmq_vhost:
         name: "/testvhost"
         state: "present"
 
     - name: Configure Rabbitmq user
-      rabbitmq_user:
+      community.rabbitmq.rabbitmq_user:
         user: "testguest"
         password: "secrete"
         vhost: "/testvhost"
@@ -180,6 +312,8 @@
   gather_facts: no
   vars:
     venv_path: /tmp/rabbitmqtest
+  vars_files:
+    - "defaults/{{ install_method }}_install.yml"
   post_tasks:
     - name: Generate venv for rabbitmq testing
       include_role:
@@ -194,7 +328,7 @@
         dest: "{{ venv_path }}/rabbitmq-test.py"
         mode: 0755
     - name: Connect to rabbitmq
-      command: "{{ venv_path }}/bin/python2 {{ venv_path }}/rabbitmq-test.py {{ hostvars[groups['rabbitmq_all'][0]]['container_address'] }}"
+      command: "{{ venv_path }}/bin/python {{ venv_path }}/rabbitmq-test.py {{ hostvars[groups['rabbitmq_all'][0]]['container_address'] }}"
   tags:
     - healthcheck
     - healthcheck-rabbitmq-install
@@ -204,14 +338,14 @@
   gather_facts: no
   tasks:
     - name: Remove test user
-      rabbitmq_user:
+      community.rabbitmq.rabbitmq_user:
         user: testguest
         password: secrete
         vhost: "/testvhost"
         state: absent
       no_log: true
     - name: Remove test vhost
-      rabbitmq_vhost:
+      community.rabbitmq.rabbitmq_vhost:
         name: "/testvhost"
         state: "absent"
   tags:
diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index ef77ea660b..388401f2e7 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -190,6 +190,11 @@ else
     # Log some data about the instance and the rest of the system
     log_instance_info
 
+    if [[ $SCENARIO =~ "infra" ]]; then
+      # Verify our infra setup and do not continue with openstack part
+      openstack-ansible healthcheck-infrastructure.yml -e osa_gather_facts=False
+    fi
+
     # Setup OpenStack
     export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/setup-openstack.log"
     openstack-ansible setup-openstack.yml -e osa_gather_facts=False ${OPENSTACK_SETUP_EXTRA_ARGS:-}
diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
index 42d19194f0..3ea55a2c0e 100644
--- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
@@ -30,6 +30,8 @@ tempest_public_subnet_allocation_pools: "172.29.249.110-172.29.249.200"
 
 ## Galera settings
 galera_monitoring_allowed_source: "0.0.0.0/0"
+# TODO(noonedeadpunk): This should be enabled, once we will re-work SSL part
+#galera_use_ssl: "{{ ('infra' in bootstrap_host_scenarios_expanded) }}"
 galera_innodb_buffer_pool_size: 16M
 galera_innodb_log_buffer_size: 4M
 galera_wsrep_provider_options:
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index e095c16e72..ed9ddd8103 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -222,6 +222,11 @@
     nodeset: ubuntu-focal
     timeout: 10800
 
+- job:
+    name: openstack-ansible-deploy-infra_lxc-ubuntu-focal
+    parent: openstack-ansible-deploy-aio
+    nodeset: ubuntu-focal
+
 - job:
     name: openstack-ansible-deploy-aio_distro_lxc-ubuntu-focal
     parent: openstack-ansible-deploy-aio
@@ -397,6 +402,11 @@
     parent: openstack-ansible-deploy-aio
     nodeset: centos-8
 
+- job:
+    name: openstack-ansible-deploy-infra_lxc-centos-8
+    parent: openstack-ansible-deploy-aio
+    nodeset: centos-8
+
 - job:
     name: openstack-ansible-deploy-aio_distro_lxc-centos-8
     parent: openstack-ansible-deploy-aio
@@ -461,6 +471,11 @@
     parent: openstack-ansible-deploy-aio
     nodeset: debian-buster
 
+- job:
+    name: openstack-ansible-deploy-infra_lxc-debian-buster
+    parent: openstack-ansible-deploy-aio
+    nodeset: debian-buster
+
 - job:
     name: openstack-ansible-deploy-aio_distro_lxc-debian-buster
     parent: openstack-ansible-deploy-aio
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index eb9f149e16..bd3b87b60a 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -52,6 +52,33 @@
         - openstack-ansible-deploy-aio_lxc-ubuntu-focal
         - openstack-ansible-upgrade-aio_lxc-ubuntu-focal
 
+- project-template:
+    name: openstack-ansible-upgrade-aio_metal-jobs
+    check:
+      jobs:
+        - openstack-ansible-upgrade-aio_metal-centos-8:
+            voting: false
+        - openstack-ansible-upgrade-aio_metal-ubuntu-focal
+    gate:
+      jobs:
+        - openstack-ansible-upgrade-aio_metal-ubuntu-focal
+
+- project-template:
+    name: openstack-ansible-deploy-infra_lxc-jobs
+    check:
+      jobs:
+        - openstack-ansible-deploy-infra_lxc-centos-8
+        - openstack-ansible-deploy-infra_lxc-debian-buster
+        - openstack-ansible-deploy-infra_lxc-ubuntu-focal
+    gate:
+      jobs:
+        - openstack-ansible-deploy-infra_lxc-centos-8
+        - openstack-ansible-deploy-infra_lxc-debian-buster
+        - openstack-ansible-deploy-infra_lxc-ubuntu-focal
+    periodic:
+      jobs:
+        - openstack-ansible-deploy-infra_lxc-ubuntu-focal
+
 - project-template:
     name: openstack-ansible-deploy-aio_distro_lxc-jobs
     experimental: