diff --git a/src/main/helm/templates/keycloak-user-crd.yaml b/src/main/helm/templates/keycloak-user-crd.yaml
index b3005e8abf11719455552ca9b75b90a3c6997aa5..42dd1067e64c01021d3df351f92caab603bc8c02 100644
--- a/src/main/helm/templates/keycloak-user-crd.yaml
+++ b/src/main/helm/templates/keycloak-user-crd.yaml
@@ -1,4 +1,5 @@
-{{ if and (not (.Values.sso).disableOzgOperator) (.Values.sso).api_user }}
+{{- if not (.Values.sso).disableOzgOperator }}
+{{ if (.Values.sso).api_user }}
 apiVersion: operator.ozgcloud.de/v1
 kind: OzgCloudKeycloakUser
 metadata:
@@ -31,4 +32,5 @@ spec:
 {{ toYaml . | indent 6 }}
     {{- end }}
   {{- end }}
-{{ end }}
\ No newline at end of file
+{{ end }}
+{{- end }}
\ No newline at end of file
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
index 5530d704cdbaedbc427b383232785cc040467787..b8647883929a1d044d1ab307dd15f6173331ed5e 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
@@ -1,4 +1,5 @@
-{{- if and (not (.Values.sso).disableOzgOperator) (.Values.sso).api_user }}
+{{- if not (.Values.sso).disableOzgOperator }}
+{{- if (.Values.sso).api_user }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -14,4 +15,5 @@ rules:
     verbs:
       - get
       - list
+{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
index 31967cdc5349fa3c32ddb6506282b497d1dec9f6..b20195a78428c6f8585200a2e9c0af9cc780a4d1 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
@@ -1,4 +1,5 @@
-{{- if and (not (.Values.sso).disableOzgOperator) (.Values.sso).api_user }}
+{{- if not (.Values.sso).disableOzgOperator }}
+{{- if (.Values.sso).api_user }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -12,4 +13,5 @@ roleRef:
   kind: Role
   name: ozgcloud-keycloak-operator-secrets-read-role-user-manager
   apiGroup: rbac.authorization.k8s.io
+{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
index fe6ced48c72cbc4009c17055d83cf59770692dcf..4144a159aebbd65bcad03fc2d88a5b023c64225f 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
@@ -1,4 +1,5 @@
-{{- if and (not (.Values.sso).disableOzgOperator) (.Values.sso).api_user }}
+{{- if not (.Values.sso).disableOzgOperator }}
+{{- if (.Values.sso).api_user }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -11,4 +12,5 @@ rules:
       - secrets
     verbs:
       - create
+{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
index c5b453d0deeb3399fd683ad8630abfc58f2c6680..147d792a337e04a4d1b4dd81c8b57826af08dfa1 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
@@ -1,4 +1,5 @@
-{{- if and (not (.Values.sso).disableOzgOperator) (.Values.sso).api_user }}
+{{- if not (.Values.sso).disableOzgOperator }}
+{{- if (.Values.sso).api_user }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -12,4 +13,5 @@ roleRef:
   kind: Role
   name: ozgcloud-keycloak-operator-secrets-write-role-user-manager
   apiGroup: rbac.authorization.k8s.io
+{{- end }}
 {{- end }}
\ No newline at end of file