diff --git a/playbooks/master_playbook_for_abi.yaml b/playbooks/master_playbook_for_abi.yaml
index 091c3a74..35ca42c4 100644
--- a/playbooks/master_playbook_for_abi.yaml
+++ b/playbooks/master_playbook_for_abi.yaml
@@ -3,6 +3,7 @@
 
 - import_playbook: 0_setup.yaml # Import Playbook To Generate Inventory & Adding SSH-Keys.
 - import_playbook: 3_setup_kvm_host.yaml # Import Playbook To Install Prerequisites On KVM_HOST.
+  when: ( installation_type | lower == "kvm" )
 - import_playbook: 4_create_bastion.yaml # Import Playbook To Create Bastion.
 - import_playbook: 5_setup_bastion.yaml # Import Playbook To Configure Bastion.
 - import_playbook: create_abi_cluster.yaml # Import Playbook To Create ABI Cluster.
diff --git a/roles/prepare_configs/tasks/main.yaml b/roles/prepare_configs/tasks/main.yaml
index 24e0e7af..31064b2c 100644
--- a/roles/prepare_configs/tasks/main.yaml
+++ b/roles/prepare_configs/tasks/main.yaml
@@ -1,4 +1,9 @@
 ---
+- name: Delete OCP Work Directory For Idempotency.
+  file:
+    path: ~/ansible_workdir
+    state: absent
+
 - name: Create Work Directory
   file:
     path: ~/ansible_workdir
diff --git a/roles/setup_params/templates/param-file.param.j2 b/roles/setup_params/templates/param-file.param.j2
index f56f32d3..f6a62287 100644
--- a/roles/setup_params/templates/param-file.param.j2
+++ b/roles/setup_params/templates/param-file.param.j2
@@ -1 +1 @@
-rd.neednet=1 ai.ip_cfg_override=1 console=ttysclp0 coreos.live.rootfs_url=http://{{ env.bastion.networking.ip }}:8080/agent.{{ ansible_architecture }}-rootfs.img ip={{ zvm.nodes[item].interface.ip }}::{{ zvm.gateway }}:{{ zvm.subnetmask }}{% if zvm.network_mode | lower != 'roce' %}::{{ zvm.nodes[item].interface.ifname }}:none{% endif %} nameserver={{ zvm.nameserver }} zfcp.allow_lun_scan=0 {% if zvm.network_mode | lower != 'roce' %}rd.znet={{ zvm.nodes[item].interface.nettype }},{{ zvm.nodes[item].interface.subchannels }},{{ zvm.nodes[item].interface.options }}{% endif %} {% if zvm.disk_type | lower != 'fcp' %}rd.dasd={{ zvm.nodes[item].dasd.disk_id }}{% else %}rd.zfcp={{ zvm.nodes[item].lun[0].paths[0].fcp}},{{ zvm.nodes[item].lun[0].paths[0].wwpn }},{{ zvm.nodes[item].lun[0].id }} {% endif %} random.trust_cpu=on rd.luks.options=discard ignition.firstboot ignition.platform.id=metal console=tty1 console=ttyS1,115200n8 coreos.inst.persistent-kargs="console=tty1 console=ttyS1,115200n8"
\ No newline at end of file
+rd.neednet=1 ai.ip_cfg_override=1 console=ttysclp0 coreos.live.rootfs_url=http://{{ env.bastion.networking.ip }}:8080/agent.{{ ansible_architecture }}-rootfs.img ip={{ zvm.nodes[item].interface.ip }}::{{ zvm.gateway }}:{{ zvm.subnetmask }}{% if zvm.network_mode | lower != 'roce' %}::{{ zvm.nodes[item].interface.ifname }}:none{% endif %} nameserver={{ zvm.nameserver }} zfcp.allow_lun_scan=0 {% if zvm.network_mode | lower != 'roce' %}rd.znet={{ zvm.nodes[item].interface.nettype }},{{ zvm.nodes[item].interface.subchannels }},{{ zvm.nodes[item].interface.options }}{% endif %} {% if zvm.disk_type | lower != 'fcp' %}rd.dasd=0.0.{{ zvm.nodes[item].dasd.disk_id }}{% else %}rd.zfcp=0.0.{{ zvm.nodes[item].lun[0].paths[0].fcp}},{{ zvm.nodes[item].lun[0].paths[0].wwpn }},{{ zvm.nodes[item].lun[0].id }} {% endif %} random.trust_cpu=on rd.luks.options=discard ignition.firstboot ignition.platform.id=metal console=tty1 console=ttyS1,115200n8 coreos.inst.persistent-kargs="console=tty1 console=ttyS1,115200n8"
\ No newline at end of file
diff --git a/roles/ssh_agent/tasks/main.yaml b/roles/ssh_agent/tasks/main.yaml
index bb17edb3..49981ed2 100644
--- a/roles/ssh_agent/tasks/main.yaml
+++ b/roles/ssh_agent/tasks/main.yaml
@@ -1,4 +1,9 @@
 ---
+- name: Ensure ~/.bash_profile exists
+  ansible.builtin.file:
+    path: ~/.bash_profile
+    state: touch
+    mode: '0644'
 
 - name: Add ansible SSH key to ssh-agent
   tags: ssh_agent, ssh