diff --git a/roles/ocp4_workload_openshift_ai/tasks/workload.yml b/roles/ocp4_workload_openshift_ai/tasks/workload.yml
index f1a3d67..ac1c2e6 100644
--- a/roles/ocp4_workload_openshift_ai/tasks/workload.yml
+++ b/roles/ocp4_workload_openshift_ai/tasks/workload.yml
@@ -20,9 +20,13 @@
   kubernetes.core.k8s_info:
     api_version: operators.coreos.com/v1alpha1
     kind: ClusterServiceVersion
-    namespace: openshift-operators
+    namespace: redhat-ods-operator
   register: r_csvs
 
+- name: Initialize CSV variable
+  ansible.builtin.set_fact:
+    _ocp4_workload_openshift_ai_installed_operator_csv: ""
+
 - name: Find CSV for the rhods operator
   set_fact:
     _ocp4_workload_openshift_ai_installed_operator_csv: "{{ item.metadata.name }}"
@@ -31,7 +35,7 @@
 
 - name: Set Openshift AI Version 3 boolean
   ansible.builtin.set_fact:
-    _ocp4_workload_openshift_ai_version_3: "{{ _ocp4_workload_openshift_ai_installed_operator_csv.startswith('rhods-operator.3.') }}"
+    _ocp4_workload_openshift_ai_version_3: "{{ _ocp4_workload_openshift_ai_installed_operator_csv.startswith('rhods-operator.3.') if _ocp4_workload_openshift_ai_installed_operator_csv else false }}"
 
 - name: Create OpenShift AI Data Science Cluster
   when: ocp4_workload_openshift_ai_deploy_dsc | bool