diff --git a/hooks/playbooks/fetch_compute_facts.yml b/hooks/playbooks/fetch_compute_facts.yml
index 273aeb77f3..898e2a037b 100644
--- a/hooks/playbooks/fetch_compute_facts.yml
+++ b/hooks/playbooks/fetch_compute_facts.yml
@@ -139,7 +139,7 @@
               {% for compute_node in groups['computes'] %}
                   - op: replace
                     path: /spec/nodes/edpm-{{ compute_node }}/hostName
-                    value: "{{compute_node}}.ci-rdo.local"
+                    value: "{{compute_node}}"
               {% endfor %}
                   - op: replace
                     path: /spec/nodeTemplate/ansible/ansibleVars/neutron_public_interface_name
diff --git a/playbooks/nfs.yml b/playbooks/nfs.yml
index a23f364b32..9dd4ee4065 100644
--- a/playbooks/nfs.yml
+++ b/playbooks/nfs.yml
@@ -72,7 +72,7 @@
         PATH: "{{ cifmw_path }}"
       vars:
         _nfs_network_name: "{{ cifmw_nfs_network | default('storage') }}"
-        _nfs_host: "{{ [groups[cifmw_nfs_target | default('computes')][0], ansible_domain] | join('.') | default('') }}"
+        _nfs_host: "{{ [groups[cifmw_nfs_target | default('computes')][0], ansible_domain] | select() | join('.') | default('') }}"
         _ipset_namespace: "{{ cifmw_install_yamls_defaults['NAMESPACE'] | default('openstack') }}"
       ansible.builtin.command:
         cmd: oc get ipset {{ _nfs_host }} -n {{ _ipset_namespace }} -o jsonpath='{.status.reservations[?(@.network=="{{ _nfs_network_name }}")]}'