diff --git a/roles/oraswdb_install/tasks/main.yml b/roles/oraswdb_install/tasks/main.yml
index 4464895db..d318d35fe 100644
--- a/roles/oraswdb_install/tasks/main.yml
+++ b/roles/oraswdb_install/tasks/main.yml
@@ -19,8 +19,9 @@
     - assert
 
 - name: install_home_db | Mount nfs share with installation media
-  ansible.builtin.mount: src="{{ nfs_server_sw }}:{{ nfs_server_sw_path }}" name={{ oracle_stage_remote }} fstype=nfs state=mounted
-  when: install_from_nfs
+  ansible.builtin.include_role:
+    name: orasw_meta
+    tasks_from: mount_stage_remote
   tags:
     - nfsmountdb
 
@@ -70,39 +71,6 @@
   tags:
     - oradbsw
 
-#
-# - name: install_home_db | Extract files to stage-area
-#   unarchive:
-#       src={{ oracle_stage }}/{{ item[0].filename }}
-#       dest={{ oracle_stage }}/{{ item[0].version }}
-#       copy=no
-#       creates="{{ oracle_stage }}/{{ item[0].version }}/{{ item[0].creates }}"
-#   with_nested:
-#     - "{{ oracle_sw_image_db }}"
-#     - "{{ db_homes_installed }}"
-#   become: true
-#   become_user: "{{ oracle_user }}"
-#   run_once: "{{ configure_cluster }}"
-#   when: item[0].version == db_homes_config[item[1].home]['version'] and item[1].state|lower == 'present' and oracle_sw_copy and oracle_sw_unpack
-#   tags:
-#     - oradbswunpack
-#
-# - name: install_home_db | Extract files to stage-area (from remote location)
-#   unarchive:
-#       src={{ oracle_stage_remote }}/{{ item[0].filename }}
-#       dest={{ oracle_stage }}/{{ item[0].version }}
-#       copy=no
-#       creates="{{ oracle_stage }}/{{ item[0].version }}/{{ item[0].creates }}"
-#   with_nested:
-#     - "{{ oracle_sw_image_db }}"
-#     - "{{ db_homes_installed }}"
-#   become: true
-#   become_user: "{{ oracle_user }}"
-#   run_once: "{{ configure_cluster }}"
-#   when: item[0].version == db_homes_config[item[1].home]['version'] and item[1].state|lower == 'present'  and not oracle_sw_copy and oracle_sw_unpack
-#   tags:
-#     - oradbswunpack
-
 - ansible.builtin.include_tasks: install-home-db.yml
   with_items:
     - "{{ db_homes_installed }}"
@@ -112,10 +80,11 @@
   tags: oradbinstall,dbchopt
 
 - name: install_home_db | Unmount nfs share with installation media
-  ansible.builtin.mount: src="{{ nfs_server_sw }}:{{ nfs_server_sw_path }}" name={{ oracle_stage_remote }} fstype=nfs state=absent
-  when: install_from_nfs
+  ansible.builtin.include_role:
+    name: orasw_meta
+    tasks_from: umount_stage_remote
   tags:
-    - nfsunmountdb
+    - nfsumountdb
 
 - name: install_home_db | copy start/stop script for autostart
   ansible.builtin.copy: