diff --git a/hooks/playbooks/hybrid_dhcp_records.yml b/hooks/playbooks/hybrid_dhcp_records.yml
new file mode 100644
index 0000000000..0cca31a423
--- /dev/null
+++ b/hooks/playbooks/hybrid_dhcp_records.yml
@@ -0,0 +1,25 @@
+- name: Configure additional DHCP host records for hybrid scenarios
+  hosts: "{{ cifmw_target_hook_host | default('localhost') }}"
+  gather_facts: false
+  tasks:
+    - name: Add host record and restart dnsmasq
+      when:
+        - hypervisor is defined
+        - ocpbm_ip is defined
+      become: true
+      block:
+        - name: Add host record
+          ansible.builtin.lineinfile:
+            create: true
+            path: "{{ cifmw_dnsmasq_basedir | default('/etc/cifmw-dnsmasq.d') }}/host_records.conf"
+            mode: '0644'
+            line: >-
+              host-record={{ hypervisor }},{{ ocpbm_ip }}
+            state: present
+            validate: "/usr/sbin/dnsmasq -C %s --test"
+          register: _add_host_record
+        - name: Restart dnsmasq  # noqa no-handler
+          when: _add_host_record.changed
+          ansible.builtin.systemd_service:
+            name: cifmw-dnsmasq.service
+            state: restarted
diff --git a/roles/ci_gen_kustomize_values/templates/nova04delta/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/nova04delta/edpm-nodeset-values/values.yaml.j2
index a8e321cea2..4987ed49d7 100644
--- a/roles/ci_gen_kustomize_values/templates/nova04delta/edpm-nodeset-values/values.yaml.j2
+++ b/roles/ci_gen_kustomize_values/templates/nova04delta/edpm-nodeset-values/values.yaml.j2
@@ -4,7 +4,6 @@
 {% set instances_names = []                                                            %}
 {% set _original_nodeset = original_content.data.nodeset | default({})                 %}
 {% set _original_nodes = _original_nodeset.nodes | default({})                         %}
-{% set _original_services = _original_nodeset['services'] | default([])                %}
 {% set _vm_type = (_original_nodes.keys() | first).split('-')[1]                       %}
 {% for _inst in cifmw_baremetal_hosts.keys()                                           %}
 {%   if 'compute' in _inst                                                             %}
@@ -44,16 +43,9 @@ data:
 {%   for range in cifmw_ci_gen_kustomize_values_sshd_ranges                            %}
           - "{{ range }}"
 {%   endfor                                                                            %}
-{% endif                                                                               %}
-{% if ('repo-setup' not in _original_services) and
-      ('repo-setup' in ci_gen_kustomize_edpm_nodeset_predeployed_services)             %}
-    services:
-      - "repo-setup"
-{%   for svc in _original_services                                                     %}
-      - "{{ svc }}"
-{%   endfor                                                                            %}
 {% endif                                                                               %}
 
+{% if cifmw_baremetal_hosts | default({}) | length > 0                                 %}
   # source roles/deploy_bmh/template/bmh.yml.j2, but it patches kustomize built outputs
   baremetalhosts:
 {% for host, def in cifmw_baremetal_hosts.items() if 'compute' in host                 %}
@@ -85,6 +77,7 @@ data:
       preprovisioningNetworkDataName: {{ _host }}-nmstate-secret
 {%    endif                                                                            %}
 {% endfor                                                                              %}
+{% endif                                                                               %}
 
 {% if 'compute' in _vm_type                                                            %}
   nova: