diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchProperties.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchProperties.java
index f6568e219c557555aa8a16aae562b767932955b1..b1e22073ff46afac4cb27ba020d19ded60a8f858 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchProperties.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchProperties.java
@@ -17,6 +17,6 @@ public class OzgCloudElasticsearchProperties {
 	private String secretDataKey;
 	private String secretCredentialsName;
 	private String host;
-	private String address;
 	private int port;
+	private String scheme;
 }
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelper.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelper.java
index a0622267326704fdb51a0bd307056432c60b8709..2ea1151edddf073f121608e9a8673d5efac7eef6 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelper.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelper.java
@@ -34,7 +34,7 @@ public class OzgCloudElasticsearchSecretHelper {
 	}
 	
 	private String buildSecretAddress() {
-		return String.format("%s:%s", properties.getAddress(), properties.getPort());
+		return String.format("%s:%s", properties.getHost(), properties.getPort());
 	}
 	
 	private String generatePassword() {
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchClientConfiguration.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchClientConfiguration.java
index 51bde5505538d43921dd3050ba226fbdd647de6f..3beb84b2eea82a92aa7d31c0e86fa472dce92742 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchClientConfiguration.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchClientConfiguration.java
@@ -47,7 +47,7 @@ public class ElasticsearchClientConfiguration {
 	}
 
 	private HttpHost createHttpHost() {
-		return new HttpHost(elasticSearchProperties.getHost(), elasticSearchProperties.getPort());
+		return new HttpHost(elasticSearchProperties.getHost(), elasticSearchProperties.getPort(), elasticSearchProperties.getScheme());
 	}
 
 	private RestClientTransport createRestClientTransport(RestClient restClient) {
diff --git a/ozgcloud-elasticsearch-operator/src/main/resources/application.yml b/ozgcloud-elasticsearch-operator/src/main/resources/application.yml
index 345acebec473da1bfe624ab59652c2c31880180f..620fb6ff1e758e815ee9dc661b204f9832eda9f4 100644
--- a/ozgcloud-elasticsearch-operator/src/main/resources/application.yml
+++ b/ozgcloud-elasticsearch-operator/src/main/resources/application.yml
@@ -4,6 +4,6 @@ ozgcloud:
     secretName: ozg-search-cluster-es-elastic-user
     secretDataKey: elastic
     secretCredentialsName: elasticsearch-credentials
-    host: https://ozg-search-cluster-es-http
-    address: ozg-search-cluster-es-http.elastic-system
-    port: 9200
\ No newline at end of file
+    host: ozg-search-cluster-es-http
+    port: 9200
+    scheme: https
\ No newline at end of file
diff --git a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchSecretBuilderTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchSecretBuilderTest.java
index 2d5e6fa62fe3a8a2fca20d681feb40bb8124db80..4477189b5ab74f4756085c085401d30aa972e907 100644
--- a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchSecretBuilderTest.java
+++ b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchSecretBuilderTest.java
@@ -11,7 +11,6 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.operator.OzgCloudElasticsearchSecretHelper;
 import de.ozgcloud.operator.common.kubernetes.NamespaceTestFactory;
 import de.ozgcloud.operator.common.kubernetes.SecretTestFactory;
 import io.fabric8.kubernetes.api.model.Secret;
@@ -28,12 +27,12 @@ class ElasticsearchSecretBuilderTest {
 	@Nested
 	class TestBuildCredentialsSecret {
 		
-		private final static String ADDRESS = "dummyAddress";
+		private final static String HOST = "dummyHost";
 		private final static int PORT = 42;
 		
 		@BeforeEach
 		void mockProperties() {
-			when(properties.getAddress()).thenReturn(ADDRESS);
+			when(properties.getHost()).thenReturn(HOST);
 			when(properties.getPort()).thenReturn(PORT);
 		}
 			
@@ -71,14 +70,14 @@ class ElasticsearchSecretBuilderTest {
 			void shouldBeSet() {
 				var secret = buildCredentialSecret();
 				
-				assertThat(secret.getStringData()).containsEntry(OzgCloudElasticsearchSecretHelper.SECRET_ADDRESS_FIELD, String.format("%s:%s", ADDRESS, PORT));
+				assertThat(secret.getStringData()).containsEntry(OzgCloudElasticsearchSecretHelper.SECRET_ADDRESS_FIELD, String.format("%s:%s", HOST, PORT));
 			}
 			
 			@Test
-			void shouldGetAddressFromProperties() {
+			void shouldGetHostFromProperties() {
 				buildCredentialSecret();
 				
-				verify(properties).getAddress();
+				verify(properties).getHost();
 			}
 			
 			@Test