diff --git a/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml b/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml
index c3afb1b08..4022c3091 100644
--- a/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml
+++ b/instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml
@@ -35,8 +35,9 @@ metadata:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 spec:
   channel: "{{ .Values.aiservice_channel }}"
-  installPlanApproval: Automatic
+  installPlanApproval: {{ .Values.aiservice_install_plan_approval }}
   name: ibm-aiservice
   source: "{{ .Values.mas_catalog_source }}"
-  sourceNamespace: openshift-marketplace
+  sourceNamespace: openshift-marketplace 
 {{- end }}
+
diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-tenant-operator-subscription.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-tenant-operator-subscription.yaml
index 317245ac1..21ecff3e7 100644
--- a/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-tenant-operator-subscription.yaml
+++ b/instance-applications/115-ibm-aiservice-tenant/templates/06-aiservice-tenant-operator-subscription.yaml
@@ -23,7 +23,7 @@ metadata:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
 spec:
   channel: "{{ .Values.catalog_channel }}"
-  installPlanApproval: Automatic
+  installPlanApproval: {{ .Values.aiservice_tenant_install_plan_approval }}
   name: ibm-aiservice-tenant
   source: "{{ .Values.catalog_source }}"
   sourceNamespace: openshift-marketplace
diff --git a/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml b/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml
index 34473e103..9cdf05219 100644
--- a/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml
+++ b/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml
@@ -94,6 +94,7 @@ spec:
             aiservice_s3_port: "{{ .Values.ibm_aiservice.aiservice_s3_port }}"
             aiservice_s3_region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}"
             aiservice_operator_log_level: "{{ .Values.ibm_aiservice.aiservice_operator_log_level }}"
+            aiservice_install_plan_approval: "{{ .Values.ibm_aiservice.aiservice_install_plan_approval }}"
 
             junitreporter:
               reporter_name: "ibm-aiservice-{{ .Values.instance.id }}"
diff --git a/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml b/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml
index 997b6f6bc..79183b39e 100644
--- a/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml
+++ b/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml
@@ -71,9 +71,9 @@ spec:
             values: "{{ `{{ toYaml . }}` }}"
             parameters:
               - name: "cluster_admin_role"
-                value: "{{ .Values.cluster_admin_role }}"
+                value: "{{ if hasKey .Values `cluster_admin_role` }}{{ .Values.cluster_admin_role }}{{ else }}true{{ end }}"
               - name: "application_admin_role"
-                value: "{{ .Values.application_admin_role }}"
+                value: "{{ if hasKey .Values `application_admin_role` }}{{ .Values.application_admin_role }}{{ else }}true{{ end }}"
               - name: "generator.repo_url"
                 value: "{{ .Values.generator.repo_url }}"
               - name: "generator.revision"
diff --git a/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml b/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml
index a39597106..c66e75f7b 100644
--- a/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml
+++ b/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml
@@ -44,6 +44,7 @@ spec:
           value: |
             catalog_source: "{{ .Values.ibm_aiservice_tenant.catalog_source }}"
             catalog_channel: "{{ .Values.ibm_aiservice_tenant.catalog_channel }}"
+            aiservice_tenant_install_plan_approval: "{{ .Values.ibm_aiservice_tenant.aiservice_tenant_install_plan_approval }}" 
             
             tenant_id: "{{ .Values.ibm_aiservice_tenant.tenant_id }}"
             aiservice_instance_id: "{{ .Values.ibm_aiservice_tenant.aiservice_instance_id }}"
@@ -52,8 +53,8 @@ spec:
             account_id: "{{ .Values.account.id }}"
             region_id: "{{ .Values.region.id }}"
             cluster_id: "{{ .Values.cluster.id }}"
-            cluster_admin_role: {{ .Values.cluster_admin_role }}
-            application_admin_role: {{ .Values.application_admin_role }}
+            cluster_admin_role: {{ if hasKey .Values "cluster_admin_role" }}{{ .Values.cluster_admin_role }}{{ else }}true{{ end }}
+            application_admin_role: {{ if hasKey .Values "application_admin_role" }}{{ .Values.application_admin_role }}{{ else }}true{{ end }}
             # SAAS
             aiservice_saas_apikey: "{{ .Values.ibm_aiservice_tenant.aiservice_saas_apikey }}"
             mas_aiservice_saas: "{{ .Values.ibm_aiservice_tenant.mas_aiservice_saas }}"
@@ -132,10 +133,10 @@ spec:
       selfHeal: true
     retry:
       limit: 20
+{{- if .Values.cluster_admin_role }}
     syncOptions:
-      {{- if .Values.cluster_admin_role }}
       - CreateNamespace=true
-      {{- end }}
+{{- end }}
 {{- if or .Values.custom_labels .Values.argocluster_instance }}
     managedNamespaceMetadata:
       labels: