diff --git a/roles/ipa-multinode/tasks/ipaserver-undercloud-setup.yml b/roles/ipa-multinode/tasks/ipaserver-undercloud-setup.yml
index cf7df1313..85dbd85c4 100644
--- a/roles/ipa-multinode/tasks/ipaserver-undercloud-setup.yml
+++ b/roles/ipa-multinode/tasks/ipaserver-undercloud-setup.yml
@@ -39,11 +39,33 @@
     line: "127.0.0.1 undercloud.localdomain localhost localhost.localdomain"
     regexp: '^127\.0\.0\.1'
 
-- name: Prepare the undercloud for installation
+- name: Including non_root_user_setup tasks list
   include_role:
     name: undercloud-setup
+    tasks_from: non_root_user_setup
   tags:
     - standalone
+  when: non_root_user_setup|bool
+
+- name: Including repo-setup role
+  include_role:
+    name: repo-setup
+  tags:
+    - standalone
+
+- name: Including package_installs tasks
+  include_role:
+    name: undercloud-setup
+    tasks_from: package_installs
+  when: package_installs|bool
+
+- name: Including hostname tasks
+  include_role:
+    name: undercloud-setup
+    tasks_from: hostname
+  tags:
+    - standalone
+  when: hostname_correction|bool or step_set_undercloud_hostname|bool
 
 - name: install tls dependencies
   become: true
diff --git a/roles/undercloud-setup/tasks/main.yml b/roles/undercloud-setup/tasks/main.yml
index 1eebceea7..e4812f4f9 100644
--- a/roles/undercloud-setup/tasks/main.yml
+++ b/roles/undercloud-setup/tasks/main.yml
@@ -26,19 +26,18 @@
   tags:
     - build
 
-- name: Run and Install DLRN gate role
-  block:
-    - name: Run DLRN gate role
-      vars:
-        artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz"
-      include_role:
-        name: build-test-packages
+- name: Run DLRN gate role
+  vars:
+    artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz"
+  include_role:
+    name: build-test-packages
+  tags:
+    - build
 
-    - name: Install gated repo
-      when: compressed_gating_repo is defined
-      include_role:
-        name: install-built-repo
-  when: freeipa_internal_ip is not defined
+- name: Install gated repo
+  when: compressed_gating_repo is defined
+  include_role:
+    name: install-built-repo
   tags:
     - build