diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/02-aiservice-rsl-secret.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/02-aiservice-rsl-secret.yaml
deleted file mode 100644
index e520ac51f..000000000
--- a/instance-applications/115-ibm-aiservice-tenant/templates/02-aiservice-rsl-secret.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-{{- if .Values.application_admin_role }}
----
-
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: "{{ .Values.tenantNamespace }}----rsl-secret"
-  namespace: "{{ .Values.tenantNamespace }}"
-  labels:
-    aiservice.ibm.com/instanceId: "{{ .Values.aiservice_instance_id }}"
-{{- if .Values.custom_labels }}
-{{- range $key, $value := .Values.custom_labels }}
-    {{ $key | quote }}: {{ $value | quote }}
-{{- end }}
-{{- end }}
-  annotations:
-      argocd.argoproj.io/sync-wave: "302"
-data:
-  rsl_org_id: {{ .Values.rsl_org_id   | default "" | toString | b64enc | quote }}
-  rsl_url: {{ .Values.rsl_url   | default "" | toString | b64enc | quote }}
-  rsl_token: {{ .Values.rsl_token   | default "" | toString | b64enc | quote }}
-  ca.crt: {{ .Values.rsl_ca_crt   | default "" | toString | b64enc | quote }}
-{{- end }}
diff --git a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml
index 32d108cdf..490424a20 100644
--- a/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml
+++ b/instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml
@@ -33,10 +33,10 @@ spec:
       url: "{{ .Values.slscfg_url }}"
       secretName: "{{ .Values.tenantNamespace }}----sls-secret"
       ca: "{{ .Values.slscfg_ca_b64enc }}"
+    {{- if not (empty .Values.rsl_ca_crt) }}
     rsl:
-      url: "{{ .Values.rsl_url }}"
-      orgId: "{{ .Values.rsl_org_id }}"
-      secretName: "{{ .Values.tenantNamespace }}----rsl-secret"
+      ca: "{{ .Values.rsl_ca_crt }}"
+    {{- end }}
     watsonxai:
       url: "{{ .Values.aiservice_watsonxai_url }}"
       secretName: "{{ .Values.tenantNamespace }}----wx-secret"
diff --git a/instance-applications/115-ibm-aiservice-tenant/values.yaml b/instance-applications/115-ibm-aiservice-tenant/values.yaml
index 5c36729ba..69ae7c41b 100644
--- a/instance-applications/115-ibm-aiservice-tenant/values.yaml
+++ b/instance-applications/115-ibm-aiservice-tenant/values.yaml
@@ -21,11 +21,7 @@ slscfg_url: "slscfg_url"
 slscfg_registration_key: "slscfg_registration_key"
 aiservice_sls_subscription_id: "001"
 
-rsl_url: "rsl_url"
-rsl_org_id: "rsl_org_id"
-rsl_token: "rsl_token"
-rsl_ca_crt: "rsl_ca_crt"
-
+rsl_ca_crt: ""
 
 # watsonx
 aiservice_watsonxai_url: "aiservice_watsonxai_url"
diff --git a/root-applications/ibm-aiservice-instance-root/values.yaml b/root-applications/ibm-aiservice-instance-root/values.yaml
index c9037b9fe..0e92a8b2e 100644
--- a/root-applications/ibm-aiservice-instance-root/values.yaml
+++ b/root-applications/ibm-aiservice-instance-root/values.yaml
@@ -272,10 +272,9 @@ ibm_aiservice_tenant:
   slscfg_registration_key: "slscfg_registration_key"
   aiservice_sls_subscription_id: "001"
   
-  rsl_url: "rsl_url"
-  rsl_org_id: "rsl_org_id"
-  rsl_token: "rsl_token"
-  rsl_ca_crt: "rsl_ca_crt"
+  # RSL - Per MASAIB-1915: Only CA cert needed for self-signed certificates
+  # RSL URL, Org ID, and token are provided during FMEA model creation in the UI
+  rsl_ca_crt: ""  # Optional: Base64-encoded CA certificate for self-signed RSL endpoints
 
   
   # watsonx
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..a88b6fb7b 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
@@ -84,7 +84,6 @@ spec:
             aiservice_s3_secretkey: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_secretkey }}"
             aiservice_s3_region: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_region }}"
 
-
             # WatsonX
             aiservice_watsonxai_apikey: "{{ .Values.ibm_aiservice_tenant.aiservice_watsonxai_apikey }}"
             aiservice_watsonxai_url: "{{ .Values.ibm_aiservice_tenant.aiservice_watsonxai_url }}"
@@ -96,10 +95,7 @@ spec:
             aiservice_watsonxai_username: "{{ .Values.ibm_aiservice_tenant.aiservice_watsonxai_username }}"
             aiservice_watsonxai_verify: "{{ .Values.ibm_aiservice_tenant.aiservice_watsonxai_verify }}"
             
-            #rsl
-            rsl_url: "{{ .Values.ibm_aiservice_tenant.rsl_url }}"
-            rsl_org_id: "{{ .Values.ibm_aiservice_tenant.rsl_org_id }}"
-            rsl_token: "{{ .Values.ibm_aiservice_tenant.rsl_token }}"
+            #rsl - Per MASAIB-1915: Only CA cert for self-signed certificates
             rsl_ca_crt: "{{ .Values.ibm_aiservice_tenant.rsl_ca_crt }}"
 
             tenant_entitlement_type: "{{ .Values.ibm_aiservice_tenant.tenant_entitlement_type }}"
diff --git a/root-applications/ibm-aiservice-tenant-root/values.yaml b/root-applications/ibm-aiservice-tenant-root/values.yaml
index e524bf77e..a92611074 100644
--- a/root-applications/ibm-aiservice-tenant-root/values.yaml
+++ b/root-applications/ibm-aiservice-tenant-root/values.yaml
@@ -287,10 +287,9 @@ ibm_aiservice_tenant:
   # slscfg_ca: "slscfg_ca"
   # slscfg_tls: "slscfg_tls"
   # slscfg_key: "slscfg_key"
-  #RSL ##review 
-  rsl_url: "rsl_url"
-  rsl_org_id: "rsl_org_id"
-  mas_aiservice_rsl_secret: "mas_aiservice_rsl_secret"
+  #RSL - Per MASAIB-1915: Only CA cert needed for self-signed certificates
+  # RSL URL, Org ID, and token are provided during FMEA model creation in the UI
+  rsl_ca_crt: ""  # Optional: Base64-encoded CA certificate for self-signed RSL endpoints
 
     
   # WatsonX