diff --git a/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml b/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
index d61ab3b60fe8cdc4364b6bff08f5fd969c56bca8..c0d3e1f6fb61b49f27de193770c1482ec6a71ef2 100644
--- a/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
+++ b/kubernetes/ansible/roles/sunbird-deploy/tasks/main.yml
@@ -46,7 +46,7 @@
     dest: "{{ role_path }}/{{ common_opa_policies_path }}/{{ item }}"
   with_items:
   - "{{ common_opa_policy_files }}"
-  when: vars[release_name + '_opa_enabled']
+  when: vars[release_name + '_opa_enabled'] is defined and vars[release_name + '_opa_enabled'] is true
 
 - name: Copy the common opa policies to release folder
   copy:
@@ -54,19 +54,19 @@
     dest: "{{ role_path }}/{{ opa_policies_path }}/{{ release_name }}/{{ item }}"
   with_items:
   - "{{ common_opa_policy_files }}"
-  when: vars[release_name + '_opa_enabled']
+  when: vars[release_name + '_opa_enabled'] is defined and vars[release_name + '_opa_enabled'] is true
 
 - name: Create OPA bundle
   shell: opa build --bundle . --optimize 0 --entrypoint "main/allow"
   args:
     chdir: "{{ role_path }}/{{ opa_policies_path }}/{{ release_name }}"
-  when: vars[release_name + '_opa_enabled']
+  when: vars[release_name + '_opa_enabled'] is defined and vars[release_name + '_opa_enabled'] is true
 
 - name: Copy the OPA bundle to helm chart directory
   copy:
     src: "{{ role_path }}/{{ opa_policies_path }}/{{ release_name }}/bundle.tar.gz"
     dest: "{{chart_path}}/bundle/"
-  when: vars[release_name + '_opa_enabled']
+  when: vars[release_name + '_opa_enabled'] is defined and vars[release_name + '_opa_enabled'] is true
 
 - name: helm upgrade
   shell: helm upgrade --install --atomic --timeout {{helm_install_timeout | d('10m')}} {{ release_name }} {{ chart_path }} -n {{namespace}}