diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
index 490fa6d7984df214c9c6de9d47ef352140df1045..cdefbaf0b1a5ca26a44630a71ecfbbdb580a2360 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
@@ -32,10 +32,10 @@ public class OzgCloudElasticsearchService {
 
 	public void copyElasticCertificate(String namespace) {
 		try {
-			LOG.debug("Copy elasticseaerch ssl certificate from namespace: {}" , properties.getServer().getCertificateNamespace());
+			LOG.debug("Copy elasticseaerch ssl certificate from namespace: {}" , properties.getServer().getNamespace());
 			LOG.debug("Copy elasticseaerch ssl certificate secret: {}" , properties.getServer().getCertificateSecretName());
 			
-		    var secretResource = kubernetesService.getSecretResource(properties.getServer().getCertificateNamespace(), properties.getServer().getCertificateSecretName());
+		    var secretResource = kubernetesService.getSecretResource(properties.getServer().getNamespace(), properties.getServer().getCertificateSecretName());
 			LOG.info("{}: Create certificate secret", namespace);
 			createCredentialSecret(secretResource,namespace);
 	    } catch (ElasticsearchException e) {
diff --git a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java
index bdca41b4e8b6174d8554eb2406a160d382634d3d..325c7c477343401eb5516ed8aefba304d4a62d93 100644
--- a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java
+++ b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java
@@ -122,7 +122,6 @@ class OzgCloudElasticsearchServiceTest {
 		@Test
 		void shouldCheckIfIndexExists() {
 			when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
-			when(serverProperties.getCertificateNamespace()).thenReturn(NAMESPACE);
 			when(properties.getServer()).thenReturn(serverProperties);
 
 			service.createIndexIfMissing(NAMESPACE);
@@ -134,8 +133,6 @@ class OzgCloudElasticsearchServiceTest {
 		@Test
 		void shouldCreateIndexIfMissing() {
 			when(kubernetesService.getSecretResource(any(), any())).thenReturn(secretResource);
-			when(serverProperties.getCertificateNamespace()).thenReturn(NAMESPACE);
-			when(remoteService.existsIndex(any())).thenReturn(false);
 			when(properties.getServer()).thenReturn(serverProperties);
 
 			service.createIndexIfMissing(NAMESPACE);