diff --git a/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/AwsElasticSettingServiceImpl.java b/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/AwsElasticSettingServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8e7506339b3fa2b31aa999c4bff2df95653f58e
--- /dev/null
+++ b/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/AwsElasticSettingServiceImpl.java
@@ -0,0 +1,24 @@
+package org.opengroup.osdu.indexer.aws.service;
+
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.service.ElasticSettingService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+@Primary
+@Component
+public class AwsElasticSettingServiceImpl implements ElasticSettingService {
+
+    @Value("${aws.es.host}")
+    String host;
+
+    int port = 443;
+
+    String userNameAndPassword = "https";
+    @Override
+    public ClusterSettings getElasticClusterInformation() {
+
+        return new ClusterSettings(host, port, userNameAndPassword);
+    }
+}
\ No newline at end of file
diff --git a/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/ElasticSettingServiceImpl.java b/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/ElasticSettingServiceImpl.java
deleted file mode 100644
index a2a1dc7b39966fbd16efcf8ad82b960385683813..0000000000000000000000000000000000000000
--- a/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/ElasticSettingServiceImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-//package org.opengroup.osdu.indexer.aws.service;
-//
-//import org.opengroup.osdu.is.core.model.ClusterSettings;
-//import org.opengroup.osdu.is.core.service.ElasticSettingService;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//
-//@Component
-//public class ElasticSettingServiceImpl implements ElasticSettingService {
-//
-//    @Value("${aws.es.host}")
-//    String host;
-//
-//    int port = 8080;
-//
-//    String userNameAndPassword = "testing";
-//    @Override
-//    public ClusterSettings getElasticClusterInformation() {
-//
-//        return new ClusterSettings(host, port, userNameAndPassword);
-//    }
-//}
diff --git a/indexer-service-aws/src/main/resources/application.properties b/indexer-service-aws/src/main/resources/application.properties
index 39840a0b69afc947b2774f587e43f81b335d2b90..7ff918931af0d63ac5fd9b5ccc6e9cb35a001890 100644
--- a/indexer-service-aws/src/main/resources/application.properties
+++ b/indexer-service-aws/src/main/resources/application.properties
@@ -18,8 +18,8 @@ spring.security.user.password=123
 spring.security.user.roles=service.storage.admin
 
 ## AWS ES configuration
-aws.es.host=https://search-osdu-indexer-tester-6xsyzsnwyopgjwwnzkgejg2pe4.us-east-1.es.amazonaws.com
-aws.es.port=8080
+aws.es.host=https://search-osdu-indexer-nj62ktooaiug2mjqzguzx5utr4.us-east-1.es.amazonaws.com
+aws.es.port=443
 
 GAE_SERVICE=indexer