diff --git a/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueue.java b/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueue.java
index 4fd7d5b21d230d8dff73ec1a3ef377858b34743a..071e44569b6cc8297a0e45c1bc073d753c7ac8e8 100644
--- a/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueue.java
+++ b/provider/indexer-aws/indexer-aws-queue-service/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueue.java
@@ -1,6 +1,6 @@
 package org.opengroup.osdu.indexerqueue.aws.api;
 // TODO: rename package
-import com.amazonaws.services.sqs.AmazonSQS;
+import com.amazonaws.services.sqs.AmazonSQSConfig;
 import com.amazonaws.services.sqs.model.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -32,7 +32,8 @@ public class IndexerQueue {
             Arguments arguments = new Arguments();
 
             log.debug(String.format("Connecting to the SQS Queue: %s", arguments.queueName));
-            AmazonSQS sqsClient = SQSBuilder.generateSqsClient(arguments.region);
+            AmazonSQSConfig sqsConfig = new AmazonSQSConfig(arguments.region);
+            sqsClient = sqsConfig.AmazonSQS();
 
             log.debug(String.format("Creating a thread pool with %s threads", arguments.maxIndexThreads));
             ThreadPoolExecutor executorPool = (ThreadPoolExecutor) Executors.newFixedThreadPool(arguments.maxIndexThreads);
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/publish/PublisherImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/publish/PublisherImpl.java
index a2cbef3e4715b20fe98e6b6445a1f30e80ac3052..d82ac766f0fec97c1b63a447f2dcec29ed052a5a 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/publish/PublisherImpl.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/publish/PublisherImpl.java
@@ -4,8 +4,8 @@ import com.amazonaws.services.sns.model.MessageAttributeValue;
 import com.amazonaws.services.sns.model.PublishRequest;
 import com.amazonaws.services.sns.AmazonSNS;
 import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.aws.sns.AmazonSNSConfig;
 import org.opengroup.osdu.core.aws.sns.PublishRequestBuilder;
-import org.opengroup.osdu.core.aws.sns.SNSBuilder;
 import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
 import org.opengroup.osdu.indexer.util.JobStatus;
 import org.springframework.beans.factory.annotation.Value;
@@ -28,7 +28,8 @@ public class PublisherImpl implements IPublisher {
 
     @Inject
     public void init(){
-        snsClient = SNSBuilder.generateAmazonSNSClient(amazonSNSRegion);
+        AmazonSNSConfig snsConfig = new AmazonSNSConfig(amazonSNSRegion);
+        snsClient = snsConfig.AmazonSNS();
     }
 
     public void publishStatusChangedTagsToTopic(DpsHeaders headers, JobStatus indexerBatchStatus) throws Exception
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/IndexerQueueTaskBuilderAws.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/IndexerQueueTaskBuilderAws.java
index 42b13513596a38da4db6497e3f4b3def6a2ba2d6..daaaab0fde6c8957fef460284a8981e288abdcd8 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/IndexerQueueTaskBuilderAws.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/IndexerQueueTaskBuilderAws.java
@@ -3,7 +3,7 @@ package org.opengroup.osdu.indexer.aws.util;
 import com.amazonaws.services.sqs.AmazonSQS;
 import com.amazonaws.services.sqs.model.SendMessageRequest;
 import org.opengroup.osdu.core.api.DpsHeaders;
-import org.opengroup.osdu.core.aws.sqs.SQSBuilder;
+import org.opengroup.osdu.core.aws.sqs.AmazonSQSConfig;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
@@ -25,7 +25,8 @@ public class IndexerQueueTaskBuilderAws extends IndexerQueueTaskBuilder {
 
     @Inject
     public void init() {
-        sqsClient = SQSBuilder.generateSqsClient(region);
+        AmazonSQSConfig sqsConfig = new AmazonSQSConfig(region);
+        sqsClient = sqsConfig.AmazonSQS();
     }
 
     @Override