diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
index e16b2faffcb20db4fa508ce90fd1ba26ce92ca58..ac4d6809c4777661af005a500c1348e4ba660da9 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
@@ -27,6 +27,7 @@ import org.opengroup.osdu.indexer.model.ElasticType;
 import org.opengroup.osdu.indexer.model.IndexSchema;
 import org.opengroup.osdu.indexer.util.parser.DateTimeParser;
 import org.opengroup.osdu.indexer.util.parser.NumberParser;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.annotation.RequestScope;
 
@@ -52,6 +53,7 @@ public class AttributeParsingServiceImpl implements IAttributeParsingService {
     @Inject
     private GeometryConversionService geometryConversionService;
     @Inject
+    @Lazy
     private JobStatus jobStatus;
 
     @Override
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java
index abb7f2a8212ef24ee24acd2fec5b532e0aa4ba47..697affadbf6ce7344c9babdb6b7988b4fdb79267 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java
@@ -25,6 +25,7 @@ import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
 import org.opengroup.osdu.is.core.service.IndicesService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
@@ -43,6 +44,7 @@ public class CronServiceImpl implements CronService{
         @Inject
         private IndicesService indicesService;
         @Inject
+        @Lazy
         private JaxRsDpsLog log;
 
         @Value("${CRON_INDEX_CLEANUP_THRESHOLD_DAYS}")
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
index f35cd0d0c6f2b0931697fb4701cbd538e85a767b..90c7d67e2571ce7ad73142aa190b0d3eb997722a 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
@@ -32,6 +32,7 @@ import org.opengroup.osdu.is.core.service.IndicesService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
 import org.apache.http.HttpStatus;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
@@ -48,6 +49,7 @@ public class IndexSchemaServiceImpl implements IndexSchemaService {
     private final Gson gson = new Gson();
 
     @Inject
+    @Lazy
     private JaxRsDpsLog log;
     @Inject
     private StorageService storageService;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java
index 2020c8dc1f840c01c706de3bf8d5ba0b5127c6b2..a306ed9870d29f819e10d5059bdf25805760aafd 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java
@@ -46,6 +46,7 @@ import org.opengroup.osdu.is.core.model.RecordMetaAttribute;
 import org.opengroup.osdu.is.core.service.MappingServiceImpl;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.opengroup.osdu.is.core.util.Preconditions;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import javax.inject.Inject;
 
@@ -53,6 +54,7 @@ import javax.inject.Inject;
 public class IndexerMappingServiceImpl extends MappingServiceImpl implements IndexerMappingService {
 
     @Inject
+    @Lazy
     private JaxRsDpsLog log;
     @Inject
     private ElasticClientHandler elasticClientHandler;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
index d654d7471e67f1940d74a7741af59cad6481a2d9..e28d5f4ae8e5dc5f9ffdda0107ca1a9cd6009a3a 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
@@ -52,6 +52,7 @@ import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.beanutils.NestedNullException;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
@@ -72,6 +73,7 @@ public class IndexerServiceImpl implements IndexerService {
     private final Gson gson = new Gson();
 
     @Inject
+    @Lazy
     private JaxRsDpsLog jaxRsDpsLog;
     @Inject
     private AuditLogger auditLogger;
@@ -96,6 +98,7 @@ public class IndexerServiceImpl implements IndexerService {
     @Inject
     private IRequestInfo requestInfo;
     @Inject
+    @Lazy
     private JobStatus jobStatus;
 
     private DpsHeaders headers;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java
index 55923873df0aaced88dbd041854acaecf2a4e966..9ffbe27f65ac9c0238835731f2eaa19cd0a07b79 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java
@@ -28,6 +28,7 @@ import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
 import org.opengroup.osdu.core.common.model.indexer.RecordInfo;
 import org.opengroup.osdu.is.core.model.RecordChangedMessages;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
@@ -47,6 +48,7 @@ public class ReindexServiceImpl implements ReindexService {
     @Inject
     private IRequestInfo requestInfo;
     @Inject
+    @Lazy
     private JaxRsDpsLog jaxRsDpsLog;
 
     @Override
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
index c3eff1efc43dde8c29fba9c7f84a95f4cf9b3eef..7ebd3a01d07dd4f8fef43884fedc7bb9b7da4d69 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
@@ -33,6 +33,7 @@ import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
 import org.opengroup.osdu.is.core.service.UrlFetchService;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
@@ -57,10 +58,12 @@ public class StorageServiceImpl implements StorageService {
     @Inject
     private UrlFetchService urlFetchService;
     @Inject
+    @Lazy
     private JobStatus jobStatus;
     @Inject
     private IRequestInfo requestInfo;
     @Inject
+    @Lazy
     private JaxRsDpsLog jaxRsDpsLog;
 
     @Value("${STORAGE_SCHEMA_HOST}")
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
index 6f85b496957f135f88394821784fbb953198fc85..be471073b6a15c4c6d87d0bcdb8aafc4773ed501 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
@@ -23,6 +23,7 @@ import org.opengroup.osdu.is.core.httpclient.HttpResponse;
 import org.opengroup.osdu.is.core.model.CloudTaskRequest;
 import org.opengroup.osdu.is.core.service.UrlFetchService;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
@@ -40,6 +41,7 @@ public class IndexerQueueTaskBuilder {
     @Inject
     private UrlFetchService urlFetchService;
     @Inject
+    @Lazy
     private JaxRsDpsLog jaxRsDpsLog;
 
     @Value("${INDEXER_QUEUE_HOST}")
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java
index edf0f4343cae15380aedbeb678be92510b8d9ac7..62816fd3e1ff0b537098d1b29f9ce0eb07183f67 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java
@@ -30,6 +30,7 @@ import org.opengroup.osdu.core.common.model.indexer.RecordStatus;
 import org.opengroup.osdu.core.common.service.is.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.spi.indexer.IPublisher;
 import org.opengroup.osdu.is.core.model.RecordChangedMessages;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java
index 473f4f0428871473e19daaa60b68c789f8f2645b..34f8ca6f8213506e0feb7cb32088b60496ec502a 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java
@@ -31,6 +31,7 @@ import org.opengroup.osdu.is.core.model.IdToken;
 import org.opengroup.osdu.is.core.provider.interfaces.cache.IJwtCache;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IServiceAccountJwtClient;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java
index 94f35f845cf0b84ea4502cbc9d387071d329a2ff..e1e448f0eb50a852954a8262ecd82cac1c2b5e69 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java
@@ -47,6 +47,7 @@ import org.opengroup.osdu.is.core.model.IdToken;
 import org.opengroup.osdu.is.core.provider.interfaces.cache.IJwtCache;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IServiceAccountJwtClient;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;