diff --git a/chart/templates/anchore/secret-ca.yaml b/chart/templates/anchore/secret-ca.yaml
index b722a994317fad362de724ab899a59702b5a8c6c..49cfcf9eee6cae8242bb1f5c464ee29390f11d59 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 }}
+{{- 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 d3a695ba0e7f3523112abf62fc78dd36eb29edf1..3df0250922d5806077c56dd964b601a375fd7924 100644
--- a/chart/templates/argocd/secret-ca.yaml
+++ b/chart/templates/argocd/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.addons.argocd.enabled) .Values.addons.argocd.sso.enabled }}
+{{- if and (or .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 d0b2d92425a5144593e99131627ab6b1bfbf3adb..b7e6b05faa400439c07a6931efb52ac11d813267 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 }}
+{{- if and  .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled .Values.addons.gitlab.sso.enabled .Values.sso.certificate_authorityS }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/chart/templates/jaeger/secret-ca.yaml b/chart/templates/jaeger/secret-ca.yaml
index 43c41f101af6fab260897a6650e1be3c21af92cd..9a82500beb463eebf02e439c0ff1ed55e3e472e2 100644
--- a/chart/templates/jaeger/secret-ca.yaml
+++ b/chart/templates/jaeger/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.jaeger.enabled) .Values.jaeger.sso.enabled }}
+{{- 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 1be21535dd3d22654fc9ce8ead47cf98cfd8a332..2b5831ed4d9e1af0479d79b1e64d78d2fdc5b24d 100644
--- a/chart/templates/kiali/secret-ca.yaml
+++ b/chart/templates/kiali/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.kiali.enabled) .Values.kiali.sso.enabled }}
+{{- 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 f943483ac2fd8a78a30bcb910d2439b57239a5e5..69d1d6977113026c184ec32f0f4c210a59a3aae3 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 (or .Values.logging.enabled) .Values.logging.sso.enabled }}
+{{- 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 174edb472ecb4f3d09ebfe61d0d76f4e8987abd0..d25b786037680443a7331aa2d628ba5d53cc2f06 100644
--- a/chart/templates/mattermost/mattermost/secret-ca.yaml
+++ b/chart/templates/mattermost/mattermost/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.addons.mattermost.enabled) .Values.addons.mattermost.sso.enabled }}
+{{- 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 7142f7c5c16ac64a590b60397052fd94939abac8..1fa54941a3675d20e79bf5ac27fcc447387911e0 100644
--- a/chart/templates/monitoring/secret-ca.yaml
+++ b/chart/templates/monitoring/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.monitoring.enabled) .Values.monitoring.sso.enabled }}
+{{- 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 00cf7fa5826a26f6ca160064faa019824ca4dd62..0f1af4ce83a80c6752f8ff39134ffdcf1f8745ce 100644
--- a/chart/templates/sonarqube/secret-ca.yaml
+++ b/chart/templates/sonarqube/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.addons.sonarqube.enabled ) .Values.addons.sonarqube.sso.enabled }}
+{{- 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 d8567f8be62579305a06445c1f002169c0561f41..506095c9d8516bd29a1afe49fecbd1cc3b6a6ed6 100644
--- a/chart/templates/twistlock/secret-ca.yaml
+++ b/chart/templates/twistlock/secret-ca.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.twistlock.enabled ) .Values.twistlock.sso.enabled }}
+{{- if and  .Values.twistlock.enabled .Values.twistlock.sso.enabled .Values.sso.certificate_authority}}
 apiVersion: v1
 kind: Secret
 metadata: