diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml
index 8cb60435ca0f2584152e29311e4fcc925db6b88f..3e3821f726bd738cf0f6475c1c8f04da14512b3d 100644
--- a/testing/indexer-test-core/pom.xml
+++ b/testing/indexer-test-core/pom.xml
@@ -115,23 +115,5 @@
             <artifactId>guava</artifactId>
             <version>27.1-jre</version>
         </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-core</artifactId>
-            <version>1.11.651</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opengroup.osdu.core.aws</groupId>
-            <artifactId>aws-osdu-util</artifactId>
-            <version>0.0.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-request-signing-apache-interceptor</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java b/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java
index 857051855b4d21a16fa78ba0e0f3f6c3b511d848..fa8e8f716b3031a86a0d417b3feeb3ebbbf9fdf8 100644
--- a/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java
+++ b/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java
@@ -1,13 +1,9 @@
 package org.opengroup.osdu.util;
 
-import com.amazonaws.auth.AWS4Signer;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.http.AWSRequestSigningApacheInterceptor;
 import com.google.gson.Gson;
 import lombok.extern.java.Log;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
-import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.message.BasicHeader;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchStatusException;
@@ -34,7 +30,6 @@ import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.opengroup.osdu.core.aws.iam.IAMConfig;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -264,12 +259,31 @@ public class ElasticUtils {
 
     protected RestHighLevelClient createClient(String username, String password, String host) {
 
-        AWSCredentialsProvider credentials = new IAMConfig().amazonAWSCredentials();
-        AWS4Signer signer = new AWS4Signer();
-        signer.setServiceName(username);
-        signer.setRegionName(password);
-        // TODO: Legal please review the use of this code coming from https://github.com/awslabs/aws-request-signing-apache-interceptor
-        HttpRequestInterceptor interceptor = new AWSRequestSigningApacheInterceptor(username, signer, credentials);
-        return new RestHighLevelClient(RestClient.builder(HttpHost.create(host)).setHttpClientConfigCallback(configCallBack -> configCallBack.addInterceptorLast(interceptor)));
+        RestHighLevelClient restHighLevelClient;
+        int port = Config.PORT;
+        try {
+            String rawString = String.format("%s:%s", username, password);
+            RestClientBuilder builder = RestClient.builder(new HttpHost(host, port, "https"));
+            builder.setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder.setConnectTimeout(REST_CLIENT_CONNECT_TIMEOUT)
+                    .setSocketTimeout(REST_CLIENT_SOCKET_TIMEOUT));
+            builder.setMaxRetryTimeoutMillis(REST_CLIENT_RETRY_TIMEOUT);
+
+            Header[] defaultHeaders = new Header[]{
+                    new BasicHeader("client.transport.nodes_sampler_interval", "30s"),
+                    new BasicHeader("client.transport.ping_timeout", "30s"),
+                    new BasicHeader("client.transport.sniff", "false"),
+                    new BasicHeader("request.headers.X-Found-Cluster", Config.getElasticHost()),
+                    new BasicHeader("cluster.name", Config.getElasticHost()),
+                    new BasicHeader("xpack.security.transport.ssl.enabled", Boolean.toString(true)),
+                    new BasicHeader("Authorization", String.format("Basic %s", Base64.getEncoder().encodeToString(rawString.getBytes()))),
+            };
+
+            builder.setDefaultHeaders(defaultHeaders);
+            restHighLevelClient = new RestHighLevelClient(builder);
+
+        } catch (Exception e) {
+            throw new AssertionError("Setup elastic error");
+        }
+        return restHighLevelClient;
     }
 }
\ No newline at end of file