diff --git a/ozgcloud-elasticsearch-operator/src/main/helm/templates/deployment.yaml b/ozgcloud-elasticsearch-operator/src/main/helm/templates/deployment.yaml
index b2c1e684a330866b9a1825f0718871525c9417d9..928a5fcaad14263502f9f70a152137156face6a4 100644
--- a/ozgcloud-elasticsearch-operator/src/main/helm/templates/deployment.yaml
+++ b/ozgcloud-elasticsearch-operator/src/main/helm/templates/deployment.yaml
@@ -93,7 +93,7 @@ spec:
           subPath: type
           readOnly: true
         - name: elasticsearch-certificate
-          mountPath: "/bindings/ca-certificates/elasticsearch-certificate.pem"
+          mountPath: "/bindings/ca-certificates/es-root-ca.pem"
           subPath: ca.crt
           readOnly: true
       volumes:
diff --git a/ozgcloud-elasticsearch-operator/src/main/helm/templates/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role.yaml b/ozgcloud-elasticsearch-operator/src/main/helm/templates/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role.yaml
index f5bfed6b3b73b010e2622492b6c8ef5aa6b7437b..7b92028c82b9571f7018ac6e5ee99646649b319e 100644
--- a/ozgcloud-elasticsearch-operator/src/main/helm/templates/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role.yaml
+++ b/ozgcloud-elasticsearch-operator/src/main/helm/templates/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role.yaml
@@ -32,6 +32,7 @@ rules:
       - ""
     resourceNames:
       - {{ required "elasticsearch.adminSecretName must be set" (.Values.elasticsearch).adminSecretName }}
+      - {{ required "elasticsearch.certificateSecretName must be set" (.Values.elasticsearch).certificateSecretName }}
     resources:
       - secrets
     verbs:
diff --git a/ozgcloud-elasticsearch-operator/src/main/helm/values.yaml b/ozgcloud-elasticsearch-operator/src/main/helm/values.yaml
index d041f12534740c122e8380834bd143f994054b0b..14594d7853482e1feff7c9efade7a362ef71d208 100644
--- a/ozgcloud-elasticsearch-operator/src/main/helm/values.yaml
+++ b/ozgcloud-elasticsearch-operator/src/main/helm/values.yaml
@@ -5,3 +5,4 @@ image:
 elasticsearch:
     namespace: elastic-system
     adminSecretName: ozg-search-cluster-es-elastic-user
+    certificateSecretName: ozg-search-cluster-es-ozg-search-es-transport-certs
diff --git a/ozgcloud-elasticsearch-operator/src/main/resources/application.yml b/ozgcloud-elasticsearch-operator/src/main/resources/application.yml
index f7e24447b7935af440e493cfec6dbd03f613cc1e..742c69ee0bc60a2713e74d8c95e95c42fc035b19 100644
--- a/ozgcloud-elasticsearch-operator/src/main/resources/application.yml
+++ b/ozgcloud-elasticsearch-operator/src/main/resources/application.yml
@@ -9,8 +9,8 @@ ozgcloud:
       host: ozg-search-cluster-es-http.${ozgcloud.elasticsearch.server.namespace}
       port: 9200
       scheme: https
-      certificateNamespace: ozgcloud-elasticsearch-operator
-      certificateSecretName: elasticsearch-certificate
+      certificateNamespace: elastic-system
+      certificateSecretName: ozg-search-cluster-es-ozg-search-es-transport-certs
       certificateSecretDataKey: ca.crt
 
 management:
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes.yaml
index b5051b24cb4510dab7488a6e2a8b570827b34cc7..ffaafb71a3fb3f24d2d3bd8116ee64f3650c0c7f 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/deployment_volumes.yaml
@@ -81,6 +81,6 @@ tests:
           path: spec.template.spec.containers[0].volumeMounts
           content:  
               name: elasticsearch-certificate
-              mountPath: "/bindings/ca-certificates/elasticsearch-certificate.pem"
+              mountPath: "/bindings/ca-certificates/es-root-ca.pem"
               subPath: ca.crt
               readOnly: true
\ No newline at end of file
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role_test.yaml
index ced2580af6be30cfcd2428d3703286b5491a94b2..3e80b1c031086388a5c2065e2b2dc77c32ca6d4d 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_admin_secret_view_role_test.yaml
@@ -60,6 +60,7 @@ tests:
                 - ""
               resourceNames:
                 - ozg-search-cluster-es-elastic-user
+                - ozg-search-cluster-es-ozg-search-es-transport-certs
               resources:
                 - secrets
               verbs: