diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
index bb0e848d8bca352e35dded061b6ddb47356e6ef6..cf088510335316d24c74c0eb8c0c40b0e3d2f65c 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
@@ -25,7 +25,7 @@ import org.opengroup.osdu.core.common.service.core.entitlements.IEntitlementsFac
 import org.opengroup.osdu.core.common.service.core.entitlements.IEntitlementsService;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.service.coreis.HeadersUtil;
-import org.opengroup.osdu.core.common.spi.coreis.IAuthorizationService;
+import org.opengroup.osdu.core.common.provider.interfaces.IAuthorizationService;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.annotation.RequestScope;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditLogger.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditLogger.java
index 48b7644a1dd4546434716a99a4734b141ddc6046..fe4922ef58b2a29ffccab739112133f54fd91a6c 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditLogger.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditLogger.java
@@ -14,9 +14,9 @@
 
 package org.opengroup.osdu.indexer.logging;
 
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.service.logging.audit.AuditPayload;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java
index 60757226cfe6bb3a4ae30513baadf40a6dacf865..cbb3246a7aa39d6b1fe2bebb15a61e2ecb0ace1e 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/middleware/AuthorizationFilter.java
@@ -1,10 +1,9 @@
 package org.opengroup.osdu.indexer.middleware;
 
-import com.google.common.base.Strings;
 import lombok.extern.java.Log;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.coreis.AuthorizationResponse;
-import org.opengroup.osdu.core.common.spi.coreis.IAuthorizationService;
+import org.opengroup.osdu.core.common.provider.interfaces.IAuthorizationService;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 import javax.inject.Inject;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/IPublisher.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/IPublisher.java
new file mode 100644
index 0000000000000000000000000000000000000000..2c2fc494da76c8a624862d796df22d4af3795300
--- /dev/null
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/IPublisher.java
@@ -0,0 +1,9 @@
+package org.opengroup.osdu.indexer.provider.interfaces;
+
+import org.opengroup.osdu.core.common.model.core.DpsHeaders;
+import org.opengroup.osdu.core.common.model.indexer.JobStatus;
+
+public interface IPublisher {
+
+    public void publishStatusChangedTagsToTopic(DpsHeaders headers, JobStatus indexerBatchStatus) throws Exception;
+}
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/ISchemaCache.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/ISchemaCache.java
new file mode 100644
index 0000000000000000000000000000000000000000..2ffd1fa0fb1419a330d4b8fa1f66bb6191b27236
--- /dev/null
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/ISchemaCache.java
@@ -0,0 +1,6 @@
+package org.opengroup.osdu.indexer.provider.interfaces;
+
+import org.opengroup.osdu.core.common.model.core.ICache;
+
+public interface ISchemaCache <String,V> extends ICache<String, V> {
+}
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 7e53f4023a82fe8b9a13d160c926b6925ffb675f..fc60b988bed1505e0898b7098b7918e7c83aab77 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
@@ -21,7 +21,7 @@ import org.elasticsearch.client.RestHighLevelClient;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.coreis.IndexInfo;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.IndicesService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java
index 58577ff6c70e735f5bddaa18204c205c27a86b85..983a7851f391e01202bb9295b8bc602ee0de3b74 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java
@@ -19,8 +19,8 @@ import org.opengroup.osdu.core.common.model.core.ClusterSettings;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticRepository;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticCredentialsCache;
 import org.opengroup.osdu.core.common.service.coreis.ITenantInfoService;
 import org.opengroup.osdu.is.core.service.ElasticSettingService;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java
index fb79db44f844e6720d7445cae6fc4fde66c7aa3b..8ae1bfd7034630f90b18b0b7392f4a0ea8f8c44a 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java
@@ -31,7 +31,7 @@ import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.service.coreis.*;
 import org.opengroup.osdu.indexer.logging.AuditLogger;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.opengroup.osdu.is.core.service.ElasticSettingService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.springframework.stereotype.Service;
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 81a4fe8ba28666045217423d05ab04e7eea7a069..04e8a8806607cbba383def7aa05b64694e3891f7 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
@@ -27,7 +27,7 @@ import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
 import org.opengroup.osdu.core.common.model.indexer.OperationType;
 import org.opengroup.osdu.core.common.model.indexer.Schema;
 import org.opengroup.osdu.core.common.model.indexer.StorageType;
-import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache;
+import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache;
 import org.opengroup.osdu.indexer.util.TypeMapper;
 import org.opengroup.osdu.core.common.model.coreis.RequestStatus;
 import org.opengroup.osdu.core.common.model.coreis.RecordMetaAttribute;
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 23fbea57c47f329a0135a136d386884e34b01861..3af261d18bd6e94342015d10750b80f1e559451a 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
@@ -36,13 +36,13 @@ import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.indexer.*;
 import org.opengroup.osdu.core.common.model.storage.ConversionStatus;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.indexer.IPublisher;
+import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
 import org.opengroup.osdu.indexer.logging.AuditLogger;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
 import org.opengroup.osdu.core.common.model.coreis.RequestStatus;
 import org.opengroup.osdu.core.common.model.coreis.RecordChangedMessages;
 import org.opengroup.osdu.core.common.model.coreis.RecordMetaAttribute;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.IndicesService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.opengroup.osdu.core.common.service.coreis.ElasticIndexNameResolver;
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 92a9e14690bbbf539bbc7df8641b350b58e558eb..69e4bfc56c9fe8eb3e67e7f5e1ea9605daeaddc4 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
@@ -27,7 +27,7 @@ import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
 import org.opengroup.osdu.core.common.model.indexer.RecordInfo;
 import org.opengroup.osdu.core.common.model.coreis.RecordChangedMessages;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
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 b98e146cb122cc7aaa32ebe97c20ea2ab22d2dd1..fdb1cfe7efaa3102e68f443de0c87566ee025762 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
@@ -29,7 +29,7 @@ import org.opengroup.osdu.core.common.model.storage.ConversionStatus;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.service.coreis.IUrlFetchService;
 import org.opengroup.osdu.core.common.model.coreis.RecordMetaAttribute;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
index 70fdbdf2cf6f06991cb728a45e21a2f21b0cb78e..1ac17b5308e49860835a6700d6e839e719345191 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
@@ -23,7 +23,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.service.logging.audit.AuditPayload;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.Map;
diff --git a/provider/indexer-aws/azure-build.yml b/provider/indexer-aws/azure-build.yml
index 78e2e712788ead2ab0269e0c7a5b7b2be0d1ea1b..8379aecec711c68a49e528be0d21e0cd9d809bc7 100644
--- a/provider/indexer-aws/azure-build.yml
+++ b/provider/indexer-aws/azure-build.yml
@@ -18,7 +18,7 @@ steps:
     displayName: 'build, test, code coverage'
     inputs:
       mavenPomFile: 'pom.xml'
-      options: '--settings ./indexer-core/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN)'
+      options: '--settings ./indexer-core/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN) -U'
       testResultsFiles: '**/*/TEST-*.xml'
       codeCoverageToolOption: JaCoCo
       goals: 'install'
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/ElasticCredentialsCacheImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/ElasticCredentialsCacheImpl.java
index db363d92d87c633e3acc37278e4d1c69fdec1acf..63b65bac319cfb8ae9f93bb3bd73d1646a2c087f 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/ElasticCredentialsCacheImpl.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/ElasticCredentialsCacheImpl.java
@@ -14,7 +14,7 @@
 
 package org.opengroup.osdu.indexer.aws.cache;
 
-import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticCredentialsCache;
 import org.springframework.stereotype.Component;
 
 @Component
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/IndexCacheImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/IndexCacheImpl.java
index 2e5976c76da15079fd330b53d038b2528fdfd85e..3835cb569099cff7b25ecba74f877c031bfdbbae 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/IndexCacheImpl.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/IndexCacheImpl.java
@@ -15,7 +15,7 @@
 package org.opengroup.osdu.indexer.aws.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.RedisCache;
-import org.opengroup.osdu.core.common.spi.coreis.IIndexCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IIndexCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/SchemaCacheImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/SchemaCacheImpl.java
index 9434ed3b67731f362a827631ac62794fcafe694c..609fb09173db281297e07ae1e8ec7ff9d28f0060 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/SchemaCacheImpl.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/SchemaCacheImpl.java
@@ -15,7 +15,7 @@
 package org.opengroup.osdu.indexer.aws.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.RedisCache;
-import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache;
+import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/persistence/ElasticRepositoryImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/persistence/ElasticRepositoryImpl.java
index fde1d238fb4f3f4386f376f1b6a8cf4d3ccff63f..f215a22404cbbb06f3a915643d859e3362f14ef5 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/persistence/ElasticRepositoryImpl.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/persistence/ElasticRepositoryImpl.java
@@ -16,7 +16,7 @@ package org.opengroup.osdu.indexer.aws.persistence;
 
 import org.opengroup.osdu.core.common.model.core.ClusterSettings;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticRepository;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
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 273fb5d19a1c0988f891bafd2bd92671095e3492..019c09eebea48864285c2265c59fb0a1832a4077 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
@@ -20,7 +20,7 @@ import com.amazonaws.services.sns.AmazonSNS;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.aws.sns.AmazonSNSConfig;
 import org.opengroup.osdu.core.aws.sns.PublishRequestBuilder;
-import org.opengroup.osdu.core.common.spi.indexer.IPublisher;
+import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
 import org.opengroup.osdu.core.common.model.indexer.JobStatus;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/HeadersInfoAwsImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/HeadersInfoAwsImpl.java
index 648bf4b641d3ef0752817ef1fd10c60e42865bf8..cae5b55f9b3274e6e5825661e5ffb3d2a6d89c2b 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/HeadersInfoAwsImpl.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/HeadersInfoAwsImpl.java
@@ -19,7 +19,7 @@ import org.apache.http.HttpStatus;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.coreis.SlbHeaders;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.opengroup.osdu.core.common.service.coreis.Preconditions;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Primary;
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/RequestInfoImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/RequestInfoImpl.java
index 9b75ac32fdee6c77da2f9b499d84b7e849928597..dbce6b79d2d907576fd71d1075d9c5440da67d90 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/RequestInfoImpl.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/RequestInfoImpl.java
@@ -18,7 +18,7 @@ import lombok.extern.java.Log;
 import org.apache.http.HttpStatus;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.AppException;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.Preconditions;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Primary;
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/AttributesCache.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/AttributesCache.java
index 3f767b41bf80197cc8b288af77257c234cc5ccea..261ae37f8040ec01ba177a1a5593406a0f4e0bbb 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/AttributesCache.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/AttributesCache.java
@@ -15,7 +15,7 @@
 package org.opengroup.osdu.indexer.azure.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.spi.coreis.IAttributesCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IAttributesCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/ElasticCredentialsCache.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/ElasticCredentialsCache.java
index e7ca531a0f07d9ed0335cdb396a50a029f964cd6..b7f36fbb563a6279be7246d74d6b3540c8c341ee 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/ElasticCredentialsCache.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/ElasticCredentialsCache.java
@@ -2,7 +2,7 @@ package org.opengroup.osdu.indexer.azure.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.VmCache;
 import org.opengroup.osdu.core.common.model.core.ClusterSettings;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticCredentialsCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/IndexCache.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/IndexCache.java
index 91dc1376af48d16a47643b9e40a7e4295987789a..b0dcc3d64da1200e8de7e09b3cd114032ec4d805 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/IndexCache.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/IndexCache.java
@@ -1,7 +1,7 @@
 package org.opengroup.osdu.indexer.azure.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.spi.coreis.IIndexCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IIndexCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/JwtCache.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/JwtCache.java
index dbdee5efb40acafc5759c32bdd0efe10b7b37725..b08cf8733db721c9e60f695bc4479319f5a8d854 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/JwtCache.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/JwtCache.java
@@ -2,7 +2,7 @@ package org.opengroup.osdu.indexer.azure.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.VmCache;
 import org.opengroup.osdu.core.common.model.coreis.IdToken;
-import org.opengroup.osdu.core.common.spi.coreis.IJwtCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IJwtCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/KindsCache.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/KindsCache.java
index bd1bb4eb6ce4fcb0373478f5d3e2efd9372ba17e..d1bd6549aaf8453746608a1e3024a82ab7167201 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/KindsCache.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/KindsCache.java
@@ -1,7 +1,7 @@
 package org.opengroup.osdu.indexer.azure.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.spi.coreis.IKindsCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IKindsCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/SchemaCache.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/SchemaCache.java
index 77dc983f7946dfe97e7740ffe0c91647a61ae326..8ac913814f110e00d1d69846509df74b00f00f0a 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/SchemaCache.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/SchemaCache.java
@@ -1,7 +1,7 @@
 package org.opengroup.osdu.indexer.azure.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache;
+import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java
index c73791b834047a5ce947a2bdb4f47de1186ee285..5cb4b9156a1cacbd2906c1a5203ddfb6b682e09c 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java
@@ -19,7 +19,7 @@ import org.apache.http.HttpStatus;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.indexer.azure.model.ElasticSettingSchema;
 import org.opengroup.osdu.core.common.model.core.ClusterSettings;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticRepository;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.service.coreis.Preconditions;
 import org.springframework.beans.factory.annotation.Value;
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 94b7716dd373eec8dc028e15fc1340aa09445ebc..4a8f4ee1476c0058faafe8e2555d78d6aaef91be 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
@@ -28,7 +28,7 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.indexer.JobStatus;
 import org.opengroup.osdu.core.common.model.indexer.RecordStatus;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.indexer.IPublisher;
+import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
 import org.opengroup.osdu.core.common.model.coreis.RecordChangedMessages;
 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/HeadersInfoAzureImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java
index 2a046d38a19ebeda5899fb2f1de920a9ea1994e0..c4b64734876e491af4a6db9452d321f0ddba3043 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java
@@ -17,7 +17,7 @@ package org.opengroup.osdu.indexer.azure.util;
 import lombok.extern.java.Log;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.coreis.SlbHeaders;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.opengroup.osdu.core.common.service.coreis.Preconditions;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java
index e194d09c2a9b9f896d84167ebd8ce01720902d61..a3c7e2ca2ead802dd0d0c5093f6907cdf17fbb10 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/RequestInfoImpl.java
@@ -20,9 +20,9 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IServiceAccountJwtClient;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IServiceAccountJwtClient;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
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 ca3b9791b8ed59591319b762fab02852afbc9507..50b85eda79b2ca5088f5d27ce5c588153224aabf 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
@@ -28,9 +28,9 @@ import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.azure.model.AADConfiguration;
 
 import org.opengroup.osdu.core.common.model.coreis.IdToken;
-import org.opengroup.osdu.core.common.spi.coreis.IJwtCache;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IServiceAccountJwtClient;
+import org.opengroup.osdu.core.common.provider.interfaces.IJwtCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IServiceAccountJwtClient;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/CronServiceImplTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/CronServiceImplTest.java
index b1604f833d1413d2bcef40a445994b64a66cf765..448d15fdd585c42d68b61564c8cb5dd810f03d7e 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/CronServiceImplTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/CronServiceImplTest.java
@@ -26,7 +26,7 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.service.CronServiceImpl;
 import org.opengroup.osdu.core.common.model.coreis.IndexInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.IndicesService;
 import org.opengroup.osdu.core.common.service.coreis.Config;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ElasticSettingServiceTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ElasticSettingServiceTest.java
index f5a839431c89f36070c32c2f016fec11d85f50b8..836c09bc122fa5a0e6c24e790466577af9573a36 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ElasticSettingServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ElasticSettingServiceTest.java
@@ -23,9 +23,9 @@ import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.service.ElasticSettingServiceImpl;
 import org.opengroup.osdu.core.common.model.core.ClusterSettings;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticRepository;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticCredentialsCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.opengroup.osdu.core.common.service.coreis.ITenantInfoService;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexCopyServiceImplTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexCopyServiceImplTest.java
index 3fb280b7ea236ec78e5058d1060f38eeb13b20ec..ae8bb1bea079c0883e59a50aad0bf0cdb0b8e134 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexCopyServiceImplTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexCopyServiceImplTest.java
@@ -35,8 +35,8 @@ import org.opengroup.osdu.indexer.logging.AuditLogger;
 import org.opengroup.osdu.indexer.service.IndexCopyServiceImpl;
 import org.opengroup.osdu.indexer.service.IndexerMappingService;
 import org.opengroup.osdu.core.common.model.core.ClusterSettings;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.is.core.service.ElasticSettingService;
 import org.opengroup.osdu.core.common.service.coreis.IndicesService;
 import org.opengroup.osdu.core.common.model.AppException;
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerSchemaServiceTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerSchemaServiceTest.java
index 000f4b5e40a22848c8134576cc734dcbadce2ce5..d7ebc39f0668c3feecdad565b5ec3c8fdfa8c82d 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerSchemaServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerSchemaServiceTest.java
@@ -26,7 +26,7 @@ import org.mockito.Mock;
 import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
 import org.opengroup.osdu.core.common.model.indexer.OperationType;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache;
+import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache;
 import org.opengroup.osdu.indexer.service.IndexSchemaServiceImpl;
 import org.opengroup.osdu.indexer.service.IndexerMappingService;
 import org.opengroup.osdu.indexer.service.StorageService;
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ReindexServiceTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ReindexServiceTest.java
index e3c2ec12fe55d5a0b8c83bb4db587ca888b76b55..097e6b09f424b1170c2583d5763c764648b044cb 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ReindexServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ReindexServiceTest.java
@@ -30,7 +30,7 @@ import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.service.ReindexServiceImpl;
 import org.opengroup.osdu.indexer.service.StorageService;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.*;
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java
index b8e0dee1006033cbf6876116100f06baabf34c41..349ec61dc13e4ac9fbfcc7a4d84d8c4303f168af 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java
@@ -32,7 +32,7 @@ import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.service.StorageServiceImpl;
 import org.opengroup.osdu.core.common.model.indexer.JobStatus;
 import org.opengroup.osdu.core.common.model.coreis.HttpResponse;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.IUrlFetchService;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.springframework.http.HttpStatus;
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/TenantInfoServiceTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/TenantInfoServiceTest.java
index d3206ca523c9d5c42f413fd48cdd634d23c360b8..08f7318b6eab6a4b02d00b52afa0fed34112726d 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/TenantInfoServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/TenantInfoServiceTest.java
@@ -24,7 +24,7 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.core.ITenantFactory;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.indexer.service.TenantInfoServiceImpl;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/provider/indexer-gcp/azure-build.yml b/provider/indexer-gcp/azure-build.yml
index d100317636cdb97d8fabdf458c40dd6f88d0e096..5e9afc90215791c3178ddecdbb3bec7d8be4f216 100644
--- a/provider/indexer-gcp/azure-build.yml
+++ b/provider/indexer-gcp/azure-build.yml
@@ -21,7 +21,7 @@ steps:
   displayName: 'build, test, code coverage'
   inputs:
     mavenPomFile: 'pom.xml'
-    options: '--settings ./indexer-core/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN)'
+    options: '--settings ./indexer-core/maven/settings.xml -DVSTS_FEED_TOKEN=$(VSTS_FEED_TOKEN) -U'
     testResultsFiles: '**/*/TEST-*.xml'
     codeCoverageToolOption: JaCoCo
     goals: 'install'
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/AttributesCache.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/AttributesCache.java
index ae10c31103f82ae9b6e08111d8d8d3077e7b2d91..748b48cf6b5cf948c6c3cf6d397a9d923b3f5aab 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/AttributesCache.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/AttributesCache.java
@@ -15,7 +15,7 @@
 package org.opengroup.osdu.indexer.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.RedisCache;
-import org.opengroup.osdu.core.common.spi.coreis.IAttributesCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IAttributesCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import java.util.Set;
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/ElasticCredentialsCache.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/ElasticCredentialsCache.java
index 0154df5498aaba80b1aa476c9b0d2af1127b9f9e..b1cb81f4d31e19e1ef93f8e84d50d35dd8c75e67 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/ElasticCredentialsCache.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/ElasticCredentialsCache.java
@@ -2,7 +2,7 @@ package org.opengroup.osdu.indexer.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.RedisCache;
 import org.opengroup.osdu.core.common.model.core.ClusterSettings;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticCredentialsCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/IndexCache.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/IndexCache.java
index bde68dea2f1893c12167117be24fdc40f50d2ea7..4bd9b9bfb24d414a56f376bd8a443e43faa1fd17 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/IndexCache.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/IndexCache.java
@@ -1,7 +1,7 @@
 package org.opengroup.osdu.indexer.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.RedisCache;
-import org.opengroup.osdu.core.common.spi.coreis.IIndexCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IIndexCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/JwtCache.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/JwtCache.java
index 101ca74ca224b523b2d287e6f25eb02bfd8d8915..564690336e9d6e8bec4a0fcedbf17bd97588bba4 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/JwtCache.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/JwtCache.java
@@ -2,7 +2,7 @@ package org.opengroup.osdu.indexer.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.RedisCache;
 import org.opengroup.osdu.core.common.model.coreis.IdToken;
-import org.opengroup.osdu.core.common.spi.coreis.IJwtCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IJwtCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/KindsCache.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/KindsCache.java
index 19760351797965eea4645c3a4a59057fbf926ce3..92ff21abe4885b1bda698b73e164c7c4ca001363 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/KindsCache.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/KindsCache.java
@@ -1,7 +1,7 @@
 package org.opengroup.osdu.indexer.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.RedisCache;
-import org.opengroup.osdu.core.common.spi.coreis.IKindsCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IKindsCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/SchemaCache.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/SchemaCache.java
index aab7acb542a7f82bf3a627a0cb245fca0e0cf0ff..bf07123ea3311d429175524efab35c3ba10c165d 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/SchemaCache.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/SchemaCache.java
@@ -1,7 +1,7 @@
 package org.opengroup.osdu.indexer.cache;
 
 import org.opengroup.osdu.core.common.model.core.cache.RedisCache;
-import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache;
+import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/kms/KmsClient.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/kms/KmsClient.java
index 0e4bb00e9104dfa8cf90935bccd7d7d5434f56f1..ae01f902927e676763e69c34dd376431741b31c6 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/kms/KmsClient.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/kms/KmsClient.java
@@ -25,7 +25,7 @@ import com.google.api.services.cloudkms.v1.model.DecryptRequest;
 import com.google.api.services.cloudkms.v1.model.DecryptResponse;
 import com.google.api.services.cloudkms.v1.model.EncryptRequest;
 import com.google.api.services.cloudkms.v1.model.EncryptResponse;
-import org.opengroup.osdu.core.common.spi.coreis.IKmsClient;
+import org.opengroup.osdu.core.common.provider.interfaces.IKmsClient;
 import org.opengroup.osdu.core.common.service.coreis.Preconditions;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/middleware/IndexFilter.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/middleware/IndexFilter.java
index 5f698a2e563d5499b5feb9c82a347f74ae7be343..7b76232f4a0c89b53e8ca9651a54d968302b5098 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/middleware/IndexFilter.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/middleware/IndexFilter.java
@@ -7,7 +7,7 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.service.core.ResponseHeaders;
 import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpMethod;
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
index cb3440b589c9ea07f77a1ff7df0a23d2414d5e49..eb6d08758c4482c5a01311404443aaeeae219b59 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java
@@ -23,8 +23,8 @@ import org.apache.http.HttpStatus;
 import org.opengroup.osdu.core.common.model.core.ClusterSettings;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
-import org.opengroup.osdu.core.common.spi.coreis.IKmsClient;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticRepository;
+import org.opengroup.osdu.core.common.provider.interfaces.IKmsClient;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository;
 import org.opengroup.osdu.core.common.service.coreis.Preconditions;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java
index 83eeb4297fd0ff5f60c09d70fd96b25da1039f8e..dcca2be1aa1790d3253876548bcd808e8232b36e 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java
@@ -33,7 +33,7 @@ import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.indexer.JobStatus;
 import org.opengroup.osdu.core.common.model.indexer.RecordStatus;
-import org.opengroup.osdu.core.common.spi.indexer.IPublisher;
+import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
 import org.opengroup.osdu.core.gcp.PubSub.PubSubExtensions;
 import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImpl.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImpl.java
index dfda1230144fc26ff657c67ea5db17ba86eab8a9..1a86ceb341a30e3a2869f67991baa2df994491c5 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImpl.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImpl.java
@@ -19,7 +19,7 @@ import lombok.extern.java.Log;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.gcp.model.AppEngineHeaders;
 import org.opengroup.osdu.core.common.model.coreis.SlbHeaders;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.opengroup.osdu.core.common.service.coreis.Preconditions;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/RequestInfoImpl.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/RequestInfoImpl.java
index 54a95d9b4c85e3f48b9896b8d9878123f9bb0a5d..d6042620e074dcc864bdddb3cc446589fb154ffa 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/RequestInfoImpl.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/RequestInfoImpl.java
@@ -8,10 +8,10 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
-import org.opengroup.osdu.core.common.spi.coreis.IServiceAccountJwtClient;
+import org.opengroup.osdu.core.common.provider.interfaces.IServiceAccountJwtClient;
 import org.opengroup.osdu.core.gcp.model.AppEngineHeaders;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
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 b563da5ca852e9c63b43df396a1efb7ea17d31c2..01a50d92848d9cdd0b9a64f3e25304bb5a10135e 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
@@ -44,8 +44,8 @@ import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.coreis.IdToken;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.IJwtCache;
-import org.opengroup.osdu.core.common.spi.coreis.IServiceAccountJwtClient;
+import org.opengroup.osdu.core.common.provider.interfaces.IJwtCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IServiceAccountJwtClient;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/CronServiceImplTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/CronServiceImplTest.java
index 232a465f0a7d972293d3d721ce8415de3d8d7599..8c865c36f94e9b3313e49d057285fcd3313f82bf 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/CronServiceImplTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/CronServiceImplTest.java
@@ -24,7 +24,7 @@ import org.mockito.Mock;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.coreis.IndexInfo;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.IndicesService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.powermock.core.classloader.annotations.PrepareForTest;
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceTest.java
index c0001a37b2135403f2761515dc69c8a0f94e3738..824e3a8abb8a85929c4a1a592af1f5f98d44d02a 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceTest.java
@@ -23,9 +23,9 @@ import org.opengroup.osdu.core.common.model.core.ClusterSettings;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticRepository;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticCredentialsCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.opengroup.osdu.core.common.service.coreis.ITenantInfoService;
 import org.springframework.test.context.junit4.SpringRunner;
 
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImplTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImplTest.java
index 295eed07876ac9d50c49cc0ca568b278be4a736b..e031ac73601e7115b1becf88f40d3eab30a2beba 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImplTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImplTest.java
@@ -35,8 +35,8 @@ import org.opengroup.osdu.core.common.model.core.ClusterSettings;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.indexer.logging.AuditLogger;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.is.core.service.ElasticSettingService;
 import org.opengroup.osdu.core.common.service.coreis.IndicesService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java
index fc226edc930717922b49002f0485e9c92952ac49..76e377e91d4be52cb8973aee4545604b30a43e24 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java
@@ -25,7 +25,7 @@ import org.mockito.Mock;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.indexer.OperationType;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache;
+import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache;
 import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
 import org.opengroup.osdu.core.common.model.coreis.RequestStatus;
 import org.opengroup.osdu.core.common.service.coreis.IndicesService;
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ReindexServiceTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ReindexServiceTest.java
index e83663a15815fc9a4352eaeb8681149a152caa08..23aa559004b206d4792751d3c1fe6fb0d8151471 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ReindexServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ReindexServiceTest.java
@@ -26,7 +26,7 @@ import org.opengroup.osdu.core.common.model.indexer.RecordQueryResponse;
 import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.*;
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceTest.java
index a9efc72ea9ff292fe4230132f394a02c829a8ac5..3ee648ed2abe700c35a58834ad27dcdce302e834 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceTest.java
@@ -29,7 +29,7 @@ import org.opengroup.osdu.core.common.model.indexer.JobStatus;
 import org.opengroup.osdu.core.common.model.indexer.RecordInfo;
 import org.opengroup.osdu.core.common.model.coreis.HttpResponse;
 import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.IUrlFetchService;
 import org.opengroup.osdu.core.common.model.indexer.RecordQueryResponse;
 import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/TenantInfoServiceTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/TenantInfoServiceTest.java
index b7a295592dcf93230fe50a0afc78f80a4c7b1996..88b99c9c0ccfa8056d22cfc44460b174fa721614 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/TenantInfoServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/TenantInfoServiceTest.java
@@ -24,7 +24,7 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.core.ITenantFactory;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.junit4.SpringRunner;
 
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImplTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImplTest.java
index 758d88cb58242dd2bfd24c7056296dba9a5702b7..3a96da54de824e9920773d234657edfc4cc76a99 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImplTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImplTest.java
@@ -39,7 +39,7 @@ import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.service.TenantInfoServiceImpl;
 import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
 import org.opengroup.osdu.core.common.model.coreis.IdToken;
-import org.opengroup.osdu.core.common.spi.coreis.IJwtCache;
+import org.opengroup.osdu.core.common.provider.interfaces.IJwtCache;
 import org.opengroup.osdu.core.common.service.coreis.Config;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;