diff --git a/ansible/roles/analytics-bootstrap-spark/tasks/main.yml b/ansible/roles/analytics-bootstrap-spark/tasks/main.yml
index 663f76d68a..117ebe1e1e 100644
--- a/ansible/roles/analytics-bootstrap-spark/tasks/main.yml
+++ b/ansible/roles/analytics-bootstrap-spark/tasks/main.yml
@@ -10,6 +10,7 @@
   with_items:
     - {var: 'azure_storage_key', value: '{{ sunbird_private_storage_account_name }}'}
     - {var: 'azure_storage_secret', value: '{{ sunbird_private_storage_account_key }}'}
+    - {var: 'OCI_CLI_AUTH', value: 'instance_principal'}
  
 
 - name: Adding PATH for oci cli Vars to bashrc file of spark.
@@ -29,17 +30,17 @@
     state: directory  
   when: cloud_service_provider == "oci"
 
-- name: Create OCI cli config location
-  become: yes
-  become_user: "{{ analytics_user }}"
-  template: src=oci-key.j2 dest={{ analytics_user_home }}/.oci/oci-key.pem mode=600 owner={{ analytics_user }} group={{ analytics_group }}
-  when: cloud_service_provider == "oci"
+# - name: Create OCI cli config location
+#   become: yes
+#   become_user: "{{ analytics_user }}"
+#   template: src=oci-key.j2 dest={{ analytics_user_home }}/.oci/oci-key.pem mode=600 owner={{ analytics_user }} group={{ analytics_group }}
+#   when: cloud_service_provider == "oci"
 
-- name: Create OCI cli config file
-  become: yes
-  become_user: "{{ analytics_user }}"
-  template: src=oci-cli-config.j2 dest={{ analytics_user_home }}/.oci/config mode=600 owner={{ analytics_user }} group={{ analytics_group }}
-  when: cloud_service_provider == "oci"
+# - name: Create OCI cli config file
+#   become: yes
+#   become_user: "{{ analytics_user }}"
+#   template: src=oci-cli-config.j2 dest={{ analytics_user_home }}/.oci/config mode=600 owner={{ analytics_user }} group={{ analytics_group }}
+#   when: cloud_service_provider == "oci"
 
 - name: Adding ENV Vars to spark servers environment.
   become: yes
diff --git a/ansible/roles/analytics-spark-provision/templates/jets3t.j2 b/ansible/roles/analytics-spark-provision/templates/jets3t.j2
index 4de8480bc2..829b6a82f1 100644
--- a/ansible/roles/analytics-spark-provision/templates/jets3t.j2
+++ b/ansible/roles/analytics-spark-provision/templates/jets3t.j2
@@ -1,5 +1,9 @@
 storage-service.request-signature-version={{ jets3t_s3_request_signature_version }}
-s3service.s3-endpoint={% if jets3t_s3_endpoint_host %}{{ jets3t_s3_endpoint_host }}{% else %}s3-ap-south-1.amazonaws.com{% endif %}
+{% if jets3t_s3_endpoint_host %}
+s3service.s3-endpoint={{ jets3t_s3_endpoint_host }}
+{% else %}
+s3service.s3-endpoint=s3-ap-south-1.amazonaws.com
+{% endif %}
 s3service.disable-dns-buckets={{ jets3t_s3_disable_dns_buckets }}
 s3service.https-only={{ jets3t_s3_https_only }}
 {% if jets3t_s3_default_bucket_location %}