diff --git a/ozgcloud-elasticsearch-operator/src/main/helm/templates/deployment.yaml b/ozgcloud-elasticsearch-operator/src/main/helm/templates/deployment.yaml
index 928a5fcaad14263502f9f70a152137156face6a4..549b8979f9eb3d62c6008b29c468926edd1b2cad 100644
--- a/ozgcloud-elasticsearch-operator/src/main/helm/templates/deployment.yaml
+++ b/ozgcloud-elasticsearch-operator/src/main/helm/templates/deployment.yaml
@@ -102,7 +102,7 @@ spec:
             name: bindings-type
         - name: elasticsearch-certificate
           secret:
-            secretName: elasticsearch-certificate
+            secretName: {{ required "elasticsearch.certificateSecretName must be set" (.Values.elasticsearch).certificateSecretName }}
             optional: false
       dnsConfig: {}
       dnsPolicy: ClusterFirst
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes.yaml
index ffaafb71a3fb3f24d2d3bd8116ee64f3650c0c7f..30fa6aa8cb13f464f7d2f201b00c6995fc84da2e 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes.yaml
@@ -60,7 +60,7 @@ tests:
           content:  
               name: elasticsearch-certificate
               secret:
-                secretName: elasticsearch-certificate
+                secretName: ozg-search-cluster-es-ozg-search-es-transport-certs
                 optional: false
 
   - it: should create volumeMounts