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 b24467df7f0053d1c18b4832752db1750b430060..2fb7726534094eb624a1592398befc8f438c857a 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
@@ -30,19 +30,6 @@ public class OzgCloudElasticsearchService {
 
 	private final KubernetesRemoteService kubernetesService;
 
-	public void copyElasticCertificate(String namespace) {
-		try {
-			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().getNamespace(), properties.getServer().getCertificateSecretName());
-			LOG.info("Create certificate secret in namespace {} after copying", namespace);
-			 
-			createAdapter(secretResource).create(secretHelper.buildCertificateSecret(namespace, getSecretData(secretResource.get())));
-	    } catch (ElasticsearchException e) {
-		throw new RuntimeException("can not copy/create elasticsearch ssl certificate");
-	   }
-	}
 
 	public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) {
 		try {
@@ -119,6 +106,19 @@ public class OzgCloudElasticsearchService {
 		}
 	}
 
+	public void copyElasticCertificate(String namespace) {
+		try {
+			var secretResource = kubernetesService.getSecretResource(namespace, properties.getCertificateSecretName());
+			LOG.info(" properties.getCertificateSecretName:", properties.getCertificateSecretName());
+			LOG.info(" Create certificate secret in namespace {}", namespace);
+			createCredentialSecret(namespace, secretResource);
+	
+		} catch (Exception e) {
+			throw new RuntimeException("Certificate secret creation failed " + namespace, e);
+		}
+
+	}
+
 	public void createCertificateIfMissing(String namespace) {
 		try {
 			LOG.debug("{}: Create certificate secret if missing...", namespace);