diff --git a/ansible/configs/osp-on-ocp/destroy_env.yml b/ansible/configs/osp-on-ocp/destroy_env.yml
index 4727c7d06f6..ef2b6844a51 100644
--- a/ansible/configs/osp-on-ocp/destroy_env.yml
+++ b/ansible/configs/osp-on-ocp/destroy_env.yml
@@ -15,3 +15,16 @@
         ACTION: "destroy"
       ansible.builtin.include_role:
         name: ocp4_workload_showroom
+    - name: Remove ocp workloads
+      when: remove_workloads | default("") | length > 0
+      block:
+      - name: Invoke roles to remove ocp workloads
+        ansible.builtin.include_role:
+          name: "{{ workload_loop_var }}"
+        vars:
+          ocp_username: "system:admin"
+          ACTION: "remove"
+          silent: false
+        loop: "{{ remove_workloads }}"
+        loop_control:
+          loop_var: workload_loop_var
diff --git a/ansible/configs/osp-on-ocp/post_software.yml b/ansible/configs/osp-on-ocp/post_software.yml
index 09c7ba6bfa1..a1216607225 100644
--- a/ansible/configs/osp-on-ocp/post_software.yml
+++ b/ansible/configs/osp-on-ocp/post_software.yml
@@ -68,12 +68,6 @@
             - /usr/bin/oc adm policy add-cluster-role-to-user cluster-admin admin
             - /usr/bin/oc delete secrets kubeadmin -n kube-system
 
-        #- name: Pre-install operators
-        #  script: files/configure_operators.sh
-
-    #    - name: Run configure_ssl.sh
-    #      script: files/configure_ssl.sh
-
         - name: Setting up OCS Storage
           include_role:
             name: ocp4_aio_role_ocs
@@ -204,14 +198,30 @@
         - "You should then automatically have oc/kubectl access to the cluster. Check out ~/ocp-install/auth/."
 
 - name: PostSoftware flight-check
-  hosts: localhost
-  connection: local
+  hosts: bastion-vm
   gather_facts: false
-  become: false
+  become: true
   tags:
     - post_flight_check
   tasks:
-
+    - name: Install aiohttp  sdk python library
+      ansible.builtin.pip:
+        name: "aiohttp"
+    - name: Install vsphere sdk
+      ansible.builtin.command: pip install git+https://github.com/vmware/vsphere-automation-sdk-python.git
+    - name: Apply infra workloads roles on nodes
+      when:
+        - infra_workloads | default("") | length > 0
+      block:
+        - name: Apply role "{{ workload_loop_var }}" on nodes
+          ansible.builtin.include_role:
+            name: "{{ workload_loop_var }}"
+          vars:
+            ACTION: "provision"
+          loop: "{{ infra_workloads }}"
+          loop_control:
+            loop_var: workload_loop_var
+            
     - name: Deploy Showroom on shared cluster
       when: showroom_deploy_shared_cluster_enable | default(false) | bool
       include_role: