diff --git a/chart/templates/anchore/secret-ca.yaml b/chart/templates/anchore/secret-ca.yaml
index 2803202e2e775db71fa2123a7ee8e7b9f631cc76..087ba515f7386db8e542906a8f3d3a8d9baf4904 100644
--- a/chart/templates/anchore/secret-ca.yaml
+++ b/chart/templates/anchore/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.addons.anchore.enabled) .Values.addons.anchore.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName}}
+{{- if and (or .Values.addons.anchore.enabled) .Values.addons.anchore.sso.enabled .Values.sso.certificate_authority }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/chart/templates/argocd/secret-ca.yaml b/chart/templates/argocd/secret-ca.yaml
index 1a806a27a59d9578690492daaff6644b70616110..00365cdac56271de92bca2cd58d91f85fc3935b5 100644
--- a/chart/templates/argocd/secret-ca.yaml
+++ b/chart/templates/argocd/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and  .Values.addons.argocd.enabled .Values.addons.argocd.sso.enabled .Values.sso.certificate_authority  .Values.sso.secretName }}
+{{- if and  .Values.addons.argocd.enabled .Values.addons.argocd.sso.enabled .Values.sso.certificate_authority   }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/chart/templates/gitlab/secret-ca.yaml b/chart/templates/gitlab/secret-ca.yaml
index cd51cc419686982bbf1553e1d38f3593a66740ef..d723c28ba53f5f3caf5110d82a764d3cd97db2ac 100644
--- a/chart/templates/gitlab/secret-ca.yaml
+++ b/chart/templates/gitlab/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled .Values.addons.gitlab.sso.enabled) .Values.sso.certificate_authority  .Values.sso.secretName}}
+{{- if and  .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled .Values.addons.gitlab.sso.enabled .Values.sso.certificate_authority}}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/chart/templates/jaeger/secret-ca.yaml b/chart/templates/jaeger/secret-ca.yaml
index 8c3d07486c1ef41bc6abbd31b352be085867f485..0d94b9f5588b178a1aca28838bd1d575d0e77c23 100644
--- a/chart/templates/jaeger/secret-ca.yaml
+++ b/chart/templates/jaeger/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and  .Values.jaeger.enabled .Values.jaeger.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName}}
+{{- if and  .Values.jaeger.enabled .Values.jaeger.sso.enabled .Values.sso.certificate_authority }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/chart/templates/kiali/secret-ca.yaml b/chart/templates/kiali/secret-ca.yaml
index 2e3d6129d4986c7254bcd9a2beb6c3883fb9f4f5..a242cf6afb36be90ccf546cf79c9958c5db29d4a 100644
--- a/chart/templates/kiali/secret-ca.yaml
+++ b/chart/templates/kiali/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and  .Values.kiali.enabled .Values.kiali.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName }}
+{{- if and  .Values.kiali.enabled .Values.kiali.sso.enabled .Values.sso.certificate_authority  }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/chart/templates/logging/elasticsearch-kibana/secret-ca.yaml b/chart/templates/logging/elasticsearch-kibana/secret-ca.yaml
index b89da78e9c750e2fe843187e160cdf03a81825d5..7d0ea6ce394ca300c8f4466cc0f39dc88d1a4cba 100644
--- a/chart/templates/logging/elasticsearch-kibana/secret-ca.yaml
+++ b/chart/templates/logging/elasticsearch-kibana/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.logging.enabled .Values.logging.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName }}
+{{- if and .Values.logging.enabled .Values.logging.sso.enabled .Values.sso.certificate_authority }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/chart/templates/mattermost/mattermost/secret-ca.yaml b/chart/templates/mattermost/mattermost/secret-ca.yaml
index 4e418af28cb128c94dbc6f3c4122510875b017b6..7752a8a844a77452ea62157aeef156a1337a9500 100644
--- a/chart/templates/mattermost/mattermost/secret-ca.yaml
+++ b/chart/templates/mattermost/mattermost/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and  .Values.addons.mattermost.enabled .Values.addons.mattermost.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName }}
+{{- if and  .Values.addons.mattermost.enabled .Values.addons.mattermost.sso.enabled .Values.sso.certificate_authority }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/chart/templates/monitoring/secret-ca.yaml b/chart/templates/monitoring/secret-ca.yaml
index 419904eeeeb4d965c93b60c7001efc1fb4330c4c..300ad3fab0ef7d4ca1f8be3d04cbcc1ce07db329 100644
--- a/chart/templates/monitoring/secret-ca.yaml
+++ b/chart/templates/monitoring/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and  .Values.monitoring.enabled .Values.monitoring.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName}}
+{{- if and  .Values.monitoring.enabled .Values.monitoring.sso.enabled .Values.sso.certificate_authority }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/chart/templates/sonarqube/secret-ca.yaml b/chart/templates/sonarqube/secret-ca.yaml
index d1a4665b7ce2f789738f19ec2d0212f33c6696e3..29109e5bca965857af4ef842ca0de2af13bdb3d3 100644
--- a/chart/templates/sonarqube/secret-ca.yaml
+++ b/chart/templates/sonarqube/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and  .Values.addons.sonarqube.enabled  .Values.addons.sonarqube.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName}}
+{{- if and  .Values.addons.sonarqube.enabled  .Values.addons.sonarqube.sso.enabled .Values.sso.certificate_authority }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/chart/templates/twistlock/secret-ca.yaml b/chart/templates/twistlock/secret-ca.yaml
index 6774af528b9d87824ababd2a8303ea90336326e1..23519f33c3396ffe33289699839c879b50b0be25 100644
--- a/chart/templates/twistlock/secret-ca.yaml
+++ b/chart/templates/twistlock/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and  .Values.twistlock.enabled .Values.twistlock.sso.enabled .Values.sso.certificate_authority .Values.sso.secretName }}
+{{- if and  .Values.twistlock.enabled .Values.twistlock.sso.enabled .Values.sso.certificate_authority }}
 apiVersion: v1
 kind: Secret
 metadata: