diff --git a/src/templates/flink-k8s-operator/delete-flink-deployments.yaml b/src/templates/flink-k8s-operator/delete-flink-deployments.yaml
index 51b029f..cefcc7e 100644
--- a/src/templates/flink-k8s-operator/delete-flink-deployments.yaml
+++ b/src/templates/flink-k8s-operator/delete-flink-deployments.yaml
@@ -1,4 +1,4 @@
-{{- if and (hasKey .Values.enterprise "flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
+{{- if and (hasKey .Values "enterprise.flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
 {{- if not (and (hasKey .Values.enterprise.flinkK8sOperatorDeploymentManager "keepFlinkDeploymentsOnUninstall") (.Values.enterprise.flinkK8sOperatorDeploymentManager.keepFlinkDeploymentsOnUninstall)) }}
 apiVersion: batch/v1
 kind: Job
diff --git a/src/templates/flink-k8s-operator/flink-deployment-creator-role.yaml b/src/templates/flink-k8s-operator/flink-deployment-creator-role.yaml
index b6757df..97d786d 100644
--- a/src/templates/flink-k8s-operator/flink-deployment-creator-role.yaml
+++ b/src/templates/flink-k8s-operator/flink-deployment-creator-role.yaml
@@ -1,4 +1,4 @@
-{{- if and (hasKey .Values.enterprise "flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
+{{- if and (hasKey .Values "enterprise.flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
diff --git a/src/templates/flink-k8s-operator/flink-deployment-creator-rolebinding.yaml b/src/templates/flink-k8s-operator/flink-deployment-creator-rolebinding.yaml
index b51b21a..727bf7d 100644
--- a/src/templates/flink-k8s-operator/flink-deployment-creator-rolebinding.yaml
+++ b/src/templates/flink-k8s-operator/flink-deployment-creator-rolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if and (hasKey .Values.enterprise "flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
+{{- if and (hasKey .Values "enterprise.flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
diff --git a/src/templates/flink-k8s-operator/flink-operator-role.yaml b/src/templates/flink-k8s-operator/flink-operator-role.yaml
index 81932b9..2c66762 100644
--- a/src/templates/flink-k8s-operator/flink-operator-role.yaml
+++ b/src/templates/flink-k8s-operator/flink-operator-role.yaml
@@ -1,4 +1,4 @@
-{{- if and (hasKey .Values.enterprise "flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
+{{- if and (hasKey .Values "enterprise.flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
diff --git a/src/templates/flink-k8s-operator/flink-operator-rolebinding.yaml b/src/templates/flink-k8s-operator/flink-operator-rolebinding.yaml
index 6f2982f..ca3ccdc 100644
--- a/src/templates/flink-k8s-operator/flink-operator-rolebinding.yaml
+++ b/src/templates/flink-k8s-operator/flink-operator-rolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if and (hasKey .Values.enterprise "flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
+{{- if and (hasKey .Values "enterprise.flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
diff --git a/src/templates/flink-k8s-operator/flink-service-account.yaml b/src/templates/flink-k8s-operator/flink-service-account.yaml
index bcd6d96..ea2ae85 100644
--- a/src/templates/flink-k8s-operator/flink-service-account.yaml
+++ b/src/templates/flink-k8s-operator/flink-service-account.yaml
@@ -1,4 +1,4 @@
-{{- if and (hasKey .Values.enterprise "flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
+{{- if and (hasKey .Values "enterprise.flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/src/templates/flink-k8s-operator/jar-shared-volume-pvc.yaml b/src/templates/flink-k8s-operator/jar-shared-volume-pvc.yaml
index 701aa70..dd9cdbe 100644
--- a/src/templates/flink-k8s-operator/jar-shared-volume-pvc.yaml
+++ b/src/templates/flink-k8s-operator/jar-shared-volume-pvc.yaml
@@ -1,4 +1,4 @@
-{{- if and (hasKey .Values.enterprise "flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
+{{- if and (hasKey .Values "enterprise.flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
diff --git a/src/templates/flink-k8s-operator/job-state-shared-volume-pvc.yaml b/src/templates/flink-k8s-operator/job-state-shared-volume-pvc.yaml
index 5eb54ab..7b6049d 100644
--- a/src/templates/flink-k8s-operator/job-state-shared-volume-pvc.yaml
+++ b/src/templates/flink-k8s-operator/job-state-shared-volume-pvc.yaml
@@ -1,4 +1,4 @@
-{{- if and (hasKey .Values.enterprise "flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
+{{- if and (hasKey .Values "enterprise.flinkK8sOperatorDeploymentManager") .Values.enterprise.flinkK8sOperatorDeploymentManager.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata: