diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
index 13a30f75c275e1d57c9d7b4556a5a35e2f5c1d27..f1a2ba0bfd09a677d65980def13f7f09e88dd23a 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchReconciler.java
@@ -73,7 +73,7 @@ public class ElasticsearchReconciler implements Reconciler<OzgCloudElasticsearch
 			service.deleteIndexIfExists(namespace);
 			return DeleteControl.defaultDelete();
 		} catch (Exception e) {
-			LOG.warn(resource.getCRDName() + ": Could not cleanup elasticsearch resource.", e);
+			LOG.warn(resource.getMetadata().getName() + ": Could not cleanup elasticsearch resource.", e);
 			return DeleteControl.defaultDelete();
 		}
 	}
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 d5ce0f979511c5c1ea61b1d295370c7e53809660..57f19ad37b3cbe23cca89542e420d1fa2e03049f 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
@@ -29,18 +29,18 @@ public class OzgCloudElasticsearchService {
 
 	public Secret getOrCreateCredentialSecret(OzgCloudElasticsearchCustomResource resource, Context<OzgCloudElasticsearchCustomResource> context) {
 		try {
-			LOG.debug("{}: Get or create secret.", resource.getCRDName());
+			LOG.debug("{}: Get or create secret.", resource.getMetadata().getName());
 			var namespace = resource.getMetadata().getNamespace();
 			var secretResource = getCredentialsSecretResource(namespace);
 
 			if (Objects.isNull(secretResource.get())) {
-				LOG.info("{}: Secret not exists, create one ...", resource.getCRDName());
+				LOG.info("{}: Secret not exists, create one ...", resource.getMetadata().getName());
 				createCredentialSecret(secretResource, namespace);
-				LOG.info("{}: Secret creation successful.", resource.getCRDName());
+				LOG.info("{}: Secret creation successful.", resource.getMetadata().getName());
 			}
 			return secretResource.get();
 		} catch (Exception e) {
-			LOG.warn(resource.getCRDName() + ": Secret creation failed: ", e);
+			LOG.warn(resource.getMetadata().getName() + ": Secret creation failed: ", e);
 			throw e;
 		}
 	}
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
index b9d307326791fd3f2e6f2c8c46e1074150db007c..12c4c5db85dff6deeb1d815386f13b54823d6b38 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchRemoteService.java
@@ -25,7 +25,7 @@ public class ElasticsearchRemoteService {
 		try {
 			LOG.debug("{}: Test if elasticsearch index exits.", index);
 			var exists = client.indices().exists(builder -> builder.index(index)).value();
-			LOG.debug("{}: Elasticsearch index exists: {}", exists);
+			LOG.debug("{}: Elasticsearch index exists: {}", index, exists);
 			return exists;
 		} catch (ElasticsearchException | IOException e) {
 			throw new RuntimeException("Error checking index '" + index, e);