diff --git a/group_vars/all.yml b/group_vars/all.yml
index 06211e6c..8aa56c91 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -117,9 +117,10 @@ force_reprovision: false
 #do not enable this while running from your desktop
 virtual_uc: false
 undercloud_host: 172.16.0.2
+undercloud_hypervisor: redhat.com
 vm_external_interface: eth0
 undercloud_local_interface: eth0
-virtual_uc_ctlplane_interface: em1
+virtual_uc_ctlplane_interface: em2
 # RHEL 7 image url
 vm_image_url: https://url.corp.redhat.com/rhel-guest-image-7-6-210-x86-64-qcow2
 # RHEL 8 image url
diff --git a/tasks/load_instackenv.yml b/tasks/load_instackenv.yml
index 30bd767b..e9b14562 100644
--- a/tasks/load_instackenv.yml
+++ b/tasks/load_instackenv.yml
@@ -49,7 +49,16 @@
     - name: set undercloud hostname
       set_fact:
         undercloud_hostname: "{{ undercloud_host }}"
+
+    - name: first node in instackenv
+      set_fact:
         instack_firstnode: "{{ (instackenv_content.nodes[0].pm_addr | replace('mgmt-','') | replace('-drac', '')) }}"
+      when: lab_name in ['scale', 'alias']
+
+    - name: undercloud hypervisor
+      set_fact:
+        instack_firstnode: "{{ undercloud_hypervisor }}"
+      when: lab_name not in ['scale', 'alias']
 
     - name: set overcloud_instackenv content
       set_fact:
diff --git a/virtual_undercloud.yml b/virtual_undercloud.yml
index 52fc543e..c4d67f98 100644
--- a/virtual_undercloud.yml
+++ b/virtual_undercloud.yml
@@ -84,12 +84,6 @@
         ansible_ssh_private_key_file: "{{ ansible_ssh_key }}"
         ansible_python_interpreter: "{{ python_interpreter }}"
 
-    - name: ignore errors for the task waiting for the undercloud to be available
-      lineinfile:
-        path: "{{ ansible_user_dir }}/.infrared/plugins/tripleo-undercloud/tasks/update_and_reboot.yml"
-        insertafter: "uc_reachable is succeeded"
-        line: "  ignore_errors: true "
-
 - hosts: undercloud
   vars:
     user: "stack"