diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml
index e7f2b0aeac8477fbbfeba58eb642a10cceb7b0e2..0b772197c89968a512b4235b3efce1c6113174f9 100644
--- a/provider/indexer-azure/pom.xml
+++ b/provider/indexer-azure/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.opengroup.osdu.indexer</groupId>
         <artifactId>indexer-service</artifactId>
-        <version>1.0.2</version>
-        <relativePath>../..</relativePath>
+        <version>1.0.0</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>indexer-azure</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.0-SNAPSHOT</version>
     <name>indexer-azure</name>
     <description>Indexer Service Azure</description>
     <packaging>jar</packaging>
@@ -90,15 +90,11 @@
             <artifactId>applicationinsights-logging-logback</artifactId>
             <version>[2.0,)</version>
         </dependency>
-        <dependency>
-            <groupId>org.opengroup.osdu</groupId>
-            <artifactId>os-core-common</artifactId>
-            <version>0.0.8</version>
-        </dependency>
+
         <dependency>
             <groupId>org.opengroup.osdu.indexer</groupId>
             <artifactId>indexer-core</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.0</version>
         </dependency>
 
         <dependency>
@@ -135,11 +131,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>3.8.1</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/IndexerAzureApplication.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/IndexerAzureApplication.java
index 6579c8cdc50d1103b84a7ebb33b65b2790b5ad61..487568dec3f716ae3e765252a63a14ec8b54875c 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/IndexerAzureApplication.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/IndexerAzureApplication.java
@@ -20,7 +20,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @SpringBootApplication
-@ComponentScan({"org.opengroup.osdu.core.common", "org.opengroup.osdu.indexer"})
+@ComponentScan({"org.opengroup.osdu.is.core", "org.opengroup.osdu.indexer"})
 public class IndexerAzureApplication {
 
     public static void main(String[] args) {
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..e6c987b6879d9cf1f46f555f5c7e1105be45cb36 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
@@ -14,8 +14,8 @@
 
 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.cache.VmCache;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.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/CosmosDBSchemaCache.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/CosmosDBSchemaCache.java
index 2f1647170cecafa4e0142b686624ff656e80aea9..39415f12ed48758d2ecf29b08c429bfb1112711d 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/CosmosDBSchemaCache.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/CosmosDBSchemaCache.java
@@ -15,8 +15,8 @@
 package org.opengroup.osdu.indexer.azure.cache;
 
 
-import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.model.storage.Schema;
+import org.opengroup.osdu.core.api.storage.models.Schema;
+import org.opengroup.osdu.core.cache.VmCache;
 import org.springframework.stereotype.Component;
 
 @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..9e865554526c679623fff7dc1d37999a388e3a0d 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
@@ -1,8 +1,8 @@
 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.cache.VmCache;
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.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..cefbe0e85ddc0515c538e888201bfac973404c14 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.cache.VmCache;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.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..2fb2b0bfb42e9cf887bd8afcdf8d731dd4139ae8 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
@@ -1,8 +1,8 @@
 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.cache.VmCache;
+import org.opengroup.osdu.is.core.model.IdToken;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.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..a8ec2f8e395033ccd749d072889de7f3f2d1f3d0 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.cache.VmCache;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.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..f662ccec3ec3f4ef61cae82561cdebbe2453576d 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.core.cache.VmCache;
+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/di/DpsLogFactory.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/DpsLogFactory.java
index 1bdb9603d7338c45e9a84069fb8e3e223f91ad74..e50e5c89a467866c8fd5d03c7831ff9c68c3864c 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/DpsLogFactory.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/DpsLogFactory.java
@@ -14,8 +14,8 @@
 
 package org.opengroup.osdu.indexer.azure.di;
 
-import org.opengroup.osdu.core.common.model.core.DpsLog;
-import org.opengroup.osdu.core.common.service.core.Log;
+import org.opengroup.osdu.core.logging.DpsLog;
+import org.opengroup.osdu.core.logging.Log;
 import org.springframework.beans.factory.FactoryBean;
 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/di/EntitlementsFactoryAzure.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsFactoryAzure.java
index 1f8009173ee498d62f038a033651fd142fe2aae1..0613ab8d8c59bbf3488ce090880881cdcc0ba956 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsFactoryAzure.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsFactoryAzure.java
@@ -14,9 +14,9 @@
 
 package org.opengroup.osdu.indexer.azure.di;
 
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.service.core.entitlements.IEntitlementsFactory;
-import org.opengroup.osdu.core.common.service.core.entitlements.IEntitlementsService;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.api.entitlements.IEntitlementsFactory;
+import org.opengroup.osdu.core.api.entitlements.IEntitlementsService;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsServiceAzure.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsServiceAzure.java
index 2888f305b33281ec05cac449e3b276ff4c9569f2..240dd0c915be69ae23538c5059dc626f84aebab8 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsServiceAzure.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsServiceAzure.java
@@ -17,11 +17,11 @@ package org.opengroup.osdu.indexer.azure.di;
 import com.microsoft.azure.spring.autoconfigure.aad.UserPrincipal;
 import org.apache.http.HttpStatus;
 
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.core.entitlements.*;
-import org.opengroup.osdu.core.common.service.core.entitlements.IEntitlementsService;
-import org.opengroup.osdu.core.common.model.core.entitlements.*;
-import org.opengroup.osdu.core.common.service.core.HttpResponse;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.api.entitlements.EntitlementsException;
+import org.opengroup.osdu.core.api.entitlements.IEntitlementsService;
+import org.opengroup.osdu.core.api.entitlements.models.*;
+import org.opengroup.osdu.core.httpclient.HttpResponse;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java
index 03d7886b6c138ffff6d3a64db40dc8d62477fbe6..5c612fcd9b3ea64aab3119d653290a954e0adeb9 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java
@@ -14,9 +14,9 @@
 
 package org.opengroup.osdu.indexer.azure.di;
 
-import org.opengroup.osdu.core.common.model.core.ICache;
-import org.opengroup.osdu.core.common.model.core.ITenantFactory;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
+import org.opengroup.osdu.core.cache.ICache;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 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/di/TenantInfoFactory.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java
index 7b1d93b54cd41d6607fa036a681bccff07b15867..b05eadaa593a633875ab4622ac85e8a749472b75 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoFactory.java
@@ -15,10 +15,9 @@
 package org.opengroup.osdu.indexer.azure.di;
 
 import lombok.extern.java.Log;
-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.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -31,7 +30,6 @@ public class TenantInfoFactory extends AbstractFactoryBean<TenantInfo> {
     @Inject
     private ITenantFactory tenantFactory;
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders headers;
     @Override
     protected TenantInfo createInstance() throws Exception {
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 46e4c25237a6a4be376954dbdf679091b08a7023..9c6060ad60b857c0e388aed9e5a90b5fa68abeb7 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
@@ -16,12 +16,12 @@ package org.opengroup.osdu.indexer.azure.persistence;
 
 import org.apache.http.HttpStatus;
 
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
+import org.opengroup.osdu.core.multitenancy.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.ElasticRepository;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.service.coreis.Preconditions;
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticRepository;
+import org.opengroup.osdu.is.core.util.AppException;
+import org.opengroup.osdu.is.core.util.Preconditions;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import javax.inject.Inject;
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 6aa81bcc627d7f176cda7a10395311c7dccd972a..8ee551f0c4bff4f63146c6dea89f1a448789c4ef 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
@@ -24,12 +24,12 @@ import com.microsoft.azure.servicebus.Message;
 import com.microsoft.azure.servicebus.TopicClient;
 import org.elasticsearch.common.Strings;
 
-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.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.indexer.IPublisher;
-import org.opengroup.osdu.core.common.model.coreis.RecordChangedMessages;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.indexer.model.RecordStatus;
+import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
+import org.opengroup.osdu.indexer.util.JobStatus;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.model.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..bf679e8e15fcd9600f74a24183885f764a9d89d7 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
@@ -15,11 +15,10 @@
 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.service.coreis.Preconditions;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.is.core.model.SlbHeaders;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.util.Preconditions;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -35,7 +34,6 @@ import java.util.stream.Collectors;
 public class HeadersInfoAzureImpl implements IHeadersInfo {
 
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders headersMap;
 
     @Value("${indexer.queue.key}")
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 1f21c20d46917bbb58c1dfa93038aab22237368c..9888e5f570d0526343f74aa4ca317421df196672 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
@@ -16,15 +16,13 @@ package org.opengroup.osdu.indexer.azure.util;
 
 import com.google.common.base.Strings;
 import org.apache.http.HttpStatus;
-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.coreis.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.model.coreis.AppException;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.model.DeploymentEnvironment;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IServiceAccountJwtClient;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -32,7 +30,7 @@ import org.springframework.web.context.annotation.RequestScope;
 import javax.inject.Inject;
 import java.util.Map;
 
-import static org.opengroup.osdu.core.common.model.core.DpsHeaders.AUTHORIZATION;
+import static org.opengroup.osdu.core.api.DpsHeaders.AUTHORIZATION;
 import static org.opengroup.osdu.indexer.azure.util.HeadersInfoAzureImpl.INDEXER_QUEUE_KEY;
 
 
@@ -41,7 +39,6 @@ import static org.opengroup.osdu.indexer.azure.util.HeadersInfoAzureImpl.INDEXER
 public class RequestInfoImpl implements IRequestInfo {
 
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders dpsHeaders;
 
     @Inject
@@ -50,7 +47,6 @@ public class RequestInfoImpl implements IRequestInfo {
     private IServiceAccountJwtClient serviceAccountJwtClient;
 
     @Inject
-    @Qualifier("TenantInfoFactorySearch")
     private TenantInfo tenantInfo;
 
     @Value("${DEPLOYMENT_ENVIRONMENT}")
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 b4da9295b4f4ae68a8e6cfae789f14226b4128a3..0930596b5cbb14ab2069c9c3d9de4c2539580353 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
@@ -20,18 +20,17 @@ import com.microsoft.aad.adal4j.AuthenticationContext;
 import com.microsoft.aad.adal4j.AuthenticationResult;
 import com.microsoft.aad.adal4j.ClientCredential;
 import org.apache.http.HttpStatus;
-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.coreis.AppException;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 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.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+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.opengroup.osdu.is.core.util.AppException;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
@@ -51,7 +50,6 @@ public class ServiceAccountJwtClientImpl implements IServiceAccountJwtClient {
     @Inject
     private IHeadersInfo headersInfoAzure;
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders dpsHeaders;
     @Inject
     private IJwtCache cacheService;
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 d1ec2f30e8c553a2ed804be3ba353c358c9a7b5f..aa4d4ef1eace8733d2d309490cdf8d16a2d89c78 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
@@ -22,13 +22,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
+import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.indexer.service.CronServiceImpl;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.model.coreis.IndexInfo;
-import org.opengroup.osdu.core.common.spi.coreis.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.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.model.IndexInfo;
+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.Config;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
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 7e1b2a1dc6692b03fa8af16be3c9a2391b813231..ce69140ee0cf65d534a509c0f462cd0341d8a733 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
@@ -19,15 +19,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.opengroup.osdu.indexer.service.ElasticSettingServiceImpl;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-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.ElasticRepository;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.service.coreis.TenantInfoService;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.IElasticCredentialsCache;
+import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticRepository;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.service.TenantInfoService;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.junit.Assert.assertEquals;
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 b2a3cab2d20f62f6602f956ffa7bc999e1154250..9a6e46baad5957a2db5141ebf17e4465029b27c3 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
@@ -30,18 +30,18 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.indexer.AuditLogger;
+import org.opengroup.osdu.core.api.DpsHeaders;
+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.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.provider.interfaces.util.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.coreis.AppException;
+import org.opengroup.osdu.is.core.service.IndicesService;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
-import org.opengroup.osdu.core.common.service.coreis.ElasticIndexNameResolver;
+import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerMappingServiceTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerMappingServiceTest.java
index 80379cab6213d11fe9d119fc8c438abe7196c26c..b2febfb7fbc8c3e46cfe98ddc079a370fd1e5d04 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerMappingServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerMappingServiceTest.java
@@ -32,10 +32,10 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
+import org.opengroup.osdu.indexer.model.IndexSchema;
 import org.opengroup.osdu.indexer.service.IndexerMappingServiceImpl;
-import org.opengroup.osdu.core.common.model.coreis.RecordMetaAttribute;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
+import org.opengroup.osdu.is.core.model.RecordMetaAttribute;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
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 a8a2e11b775b81596ea91355f2b576d99488f689..d006594c690548f26e89e36e0c51b84dd4215e4a 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
@@ -23,18 +23,18 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 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.spi.indexer.ISchemaCache;
+import org.opengroup.osdu.indexer.model.IndexSchema;
+import org.opengroup.osdu.indexer.model.OperationType;
+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;
-import org.opengroup.osdu.core.common.model.coreis.RequestStatus;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.service.coreis.IndicesService;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
+import org.opengroup.osdu.is.core.httpclient.RequestStatus;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.service.IndicesService;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
-import org.opengroup.osdu.core.common.service.coreis.ElasticIndexNameResolver;
+import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
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 3b4575d15ca7b4dd2f841d9650fb0a9ac76f427b..41fe0ab3414625bb684bf76044e2dc7d480d0f90 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
@@ -23,14 +23,14 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.indexer.RecordQueryResponse;
-import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.indexer.model.RecordQueryResponse;
+import org.opengroup.osdu.indexer.model.RecordReindexRequest;
 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.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.provider.interfaces.util.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 16c36c4006202ddc4ccbd3161cff6d8ef2961ea5..59ef0dacebccb21c96e1f17ac8d824fc5a34e2bb 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
@@ -24,17 +24,17 @@ import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.opengroup.osdu.core.common.model.indexer.RecordInfo;
-import org.opengroup.osdu.core.common.model.indexer.RecordQueryResponse;
-import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
-import org.opengroup.osdu.core.common.model.indexer.Records;
+import org.opengroup.osdu.indexer.model.RecordQueryResponse;
+import org.opengroup.osdu.indexer.model.RecordReindexRequest;
+import org.opengroup.osdu.indexer.model.Records;
 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.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
-import org.opengroup.osdu.core.common.service.coreis.UrlFetchService;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
+import org.opengroup.osdu.indexer.util.JobStatus;
+import org.opengroup.osdu.indexer.util.RecordInfo;
+import org.opengroup.osdu.is.core.httpclient.HttpResponse;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
+import org.opengroup.osdu.is.core.service.UrlFetchService;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit4.SpringRunner;
 
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 ee9a7afd8b9e13e26bad83e55df501e9d82b7688..b0ad80f8ec6dfd75a9dda5316eae7595909b5226 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
@@ -20,12 +20,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-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.api.DpsHeaders;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.opengroup.osdu.indexer.service.TenantInfoServiceImpl;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.junit4.SpringRunner;
 
diff --git a/provider/indexer-gcp/maven/settings.xml b/provider/indexer-gcp/maven/settings.xml
index 2a633d9a30c1997609060dcc31667d3dc1b6774a..601aa71ea3679d558de22b4e530c9dc2a9467f7f 100644
--- a/provider/indexer-gcp/maven/settings.xml
+++ b/provider/indexer-gcp/maven/settings.xml
@@ -4,10 +4,10 @@
 	xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
 	<servers>
 		<server>
-            <id>os-core</id>
-            <username>slb-des-ext-collaboration</username>
+			<id>dev-azure-com-slb-des-ext-collaboration-os-core</id>
+			<username>os-core</username>
 			<!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
-            <!-- The generated token expires on or before 11/14/2019 -->
+			<!-- The generated token expires on or before 10/8/2019 -->
 			<password>${VSTS_FEED_TOKEN}</password>
 		</server>
 	</servers>
diff --git a/provider/indexer-gcp/pom.xml b/provider/indexer-gcp/pom.xml
index 67a055275ff98c1f49548ef8c4208f0789498cd2..36ee494de4213a7d8bfde980a576a36c1cbdfffe 100644
--- a/provider/indexer-gcp/pom.xml
+++ b/provider/indexer-gcp/pom.xml
@@ -7,18 +7,17 @@
     <parent>
         <groupId>org.opengroup.osdu.indexer</groupId>
         <artifactId>indexer-service</artifactId>
-        <version>1.0.2</version>
-        <relativePath>../../pom.xml</relativePath>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>indexer-gcp</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.0</version>
     <name>indexer-gcp</name>
     <description>Indexer Service GCP App Engine</description>
     <packaging>jar</packaging>
     <repositories>
         <repository>
-            <id>os-core</id>
+            <id>dev-azure-com-slb-des-ext-collaboration-os-core</id>
             <url>https://pkgs.dev.azure.com/slb-des-ext-collaboration/_packaging/os-core/maven/v1</url>
             <releases>
             <enabled>true</enabled>
@@ -32,13 +31,19 @@
         <dependency>
             <groupId>org.opengroup.osdu.indexer</groupId>
             <artifactId>indexer-core</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>core-lib-gcp</artifactId>
-            <version>0.1.12</version>
+            <version>0.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.opengroup.osdu</groupId>
+                    <artifactId>core-lib</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -141,12 +146,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>3.8.1</version>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/com.github.stefanbirkner/system-rules -->
         <dependency>
             <groupId>com.github.stefanbirkner</groupId>
diff --git a/provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl b/provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl
index 269585f74061f31dc85360dfabdbfef2d472495d..e556aa11dd0dc02461cd2666fb7bb77cb2638b64 100644
--- a/provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl
+++ b/provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl
@@ -66,10 +66,6 @@ then
 
         echo "Replacing GOOGLE_CLOUD_PROJECT_PLACE_HOLDER with $PROJECT_ID"
         sed -i "s|GOOGLE_CLOUD_PROJECT_PLACE_HOLDER|$PROJECT_ID|g" app.yaml
-        sed -i -e "s|AUTHORIZE_API_VAR|$AUTHORIZE_API|g" app.yaml
-        sed -i -e "s|CRON_JOB_IP_VAR|$CRON_JOB_IP|g" app.yaml
-        sed -i -e "s|LEGAL_HOSTNAME_VAR|$LEGAL_HOSTNAME|g" app.yaml
-        sed -i -e "s|REGION_VAR|$REGION|g" app.yaml
 
         echo "Content of app.yaml:"
         cat app.yaml
diff --git a/provider/indexer-gcp/scripts/stage-artifacts.sh b/provider/indexer-gcp/scripts/stage-artifacts.sh
index 33e36f2c3a6430017f35f40f27f49acb7590fe55..20056c7ee1d1f93d85fafbf56026df777845b270 100644
--- a/provider/indexer-gcp/scripts/stage-artifacts.sh
+++ b/provider/indexer-gcp/scripts/stage-artifacts.sh
@@ -25,7 +25,7 @@ cd ..
 # Upload all build and deploy scripts as artifacts
 cp -R ./scripts $STAGE_DIR
 # Upload the build generated .jar file as an artifact
-cp ./target/indexer-gcp-*-spring-boot.jar $STAGE_DIR
+cp ./target/indexer-gcp-1.0.0.jar $STAGE_DIR
 
 echo "Staging deployment artifacts to folder: $STAGE_DIR"
 cp ./src/main/appengine/app.yaml $STAGE_DIR
diff --git a/provider/indexer-gcp/src/main/appengine/app.yaml b/provider/indexer-gcp/src/main/appengine/app.yaml
index 905d3b69f69ed2b4d652bf0ce3d54eba101fcd0a..730fb9b3a7f858a87ea128206d7d48c434d3d078 100644
--- a/provider/indexer-gcp/src/main/appengine/app.yaml
+++ b/provider/indexer-gcp/src/main/appengine/app.yaml
@@ -34,7 +34,3 @@ handlers:
 
 env_variables:
   GOOGLE_CLOUD_PROJECT: "GOOGLE_CLOUD_PROJECT_PLACE_HOLDER"
-  AUTHORIZE_API: "AUTHORIZE_API_VAR"
-  CRON_JOB_IP: "CRON_JOB_IP_VAR"
-  LEGAL_HOSTNAME: "LEGAL_HOSTNAME_VAR"
-  REGION: "REGION_VAR"
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/IndexerGcpApplication.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/IndexerGcpApplication.java
index 5cb877151202a552f498605bc90cee23b6a06d55..7a3f9c21007c16a1b92e9cecac7bd0b108031996 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/IndexerGcpApplication.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/IndexerGcpApplication.java
@@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
 
 @SpringBootApplication(exclude = { SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class })
 @Configuration
-@ComponentScan({"org.opengroup.osdu.core.common", "org.opengroup.osdu.indexer"})
+@ComponentScan({"org.opengroup.osdu.is.core", "org.opengroup.osdu.indexer"})
 public class IndexerGcpApplication {
 
     public static void main(String[] args) {
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..bebf28bdfd6b90d98137e3878f1f350ba5195f81 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
@@ -14,8 +14,8 @@
 
 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.cache.RedisCache;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.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/DatastoreCredentialCache.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/DatastoreCredentialCache.java
index 4ab69267c245121da87eeb3d158be86dc081d42b..50a59a97ed8763bae9329bbf5c7a9c62d47fc9c1 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/DatastoreCredentialCache.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/DatastoreCredentialCache.java
@@ -15,7 +15,7 @@
 package org.opengroup.osdu.indexer.cache;
 
 import com.google.auth.oauth2.AccessToken;
-import org.opengroup.osdu.core.common.model.core.cache.RedisCache;
+import org.opengroup.osdu.core.cache.RedisCache;
 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/ElasticCredentialsCache.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/ElasticCredentialsCache.java
index 0154df5498aaba80b1aa476c9b0d2af1127b9f9e..9f517b8eed551bb989d001cdaa6e50ac8d6d7597 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
@@ -1,8 +1,8 @@
 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.cache.RedisCache;
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.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..dbe09db285b3a00733c462e2383393e1bcbc0fbb 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.cache.RedisCache;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.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..29b3b5e49b09398d2f082d984f2173964b20e464 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
@@ -1,8 +1,8 @@
 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.cache.RedisCache;
+import org.opengroup.osdu.is.core.model.IdToken;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.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..eacd8a8a7365d9c0bc0a88b62ce0a32bd90b8f08 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.cache.RedisCache;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.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..396f70ae3c01215d2f7f34b7de567c1dd6343154 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.core.cache.RedisCache;
+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/di/DpsLogFactory.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/DpsLogFactory.java
index 5820b3ce3e75a3d00300104d63b1f601870228fc..3de3fdf9d8583de246c8457e166e8224df3d417b 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/DpsLogFactory.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/DpsLogFactory.java
@@ -14,8 +14,8 @@
 
 package org.opengroup.osdu.indexer.di;
 
-import org.opengroup.osdu.core.common.model.core.DpsLog;
 import org.opengroup.osdu.core.gcp.logging.logger.AppEngineLoggingProvider;
+import org.opengroup.osdu.core.logging.DpsLog;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 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/di/TenantFactoryService.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantFactoryService.java
index 9f74ac84a18abd5ab648cdd915dc12e4aa7d071b..8fd00807fc5894810102b809efb041108364b6bf 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantFactoryService.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantFactoryService.java
@@ -15,8 +15,8 @@
 package org.opengroup.osdu.indexer.di;
 
 import lombok.extern.java.Log;
-import org.opengroup.osdu.core.common.model.core.ITenantFactory;
 import org.opengroup.osdu.core.gcp.multitenancy.TenantFactory;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 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/di/TenantInfoFactory.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java
index ee6ea7ab6ee5beec64cbe760c13f38b4aeabbc7b..8368a259e175f39f5abd9dfd9fd425d1479e076e 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java
@@ -1,9 +1,9 @@
 package org.opengroup.osdu.indexer.di;
 
 import lombok.extern.java.Log;
-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.api.DpsHeaders;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 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/kms/KmsClient.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/kms/KmsClient.java
index 0e4bb00e9104dfa8cf90935bccd7d7d5434f56f1..3bd6aaf103d69cf7bd78cccdffa9fc1b27845b1c 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,8 +25,8 @@ 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.service.coreis.Preconditions;
+import org.opengroup.osdu.is.core.provider.interfaces.kms.IKmsClient;
+import org.opengroup.osdu.is.core.util.Preconditions;
 import org.springframework.beans.factory.annotation.Value;
 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/middleware/IndexFilter.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/middleware/IndexFilter.java
index e95c4d4af1ae4f29157c6fc52fb0e61fac69d09d..89ba9cc67345b53668da3cd78763b4ec667b59b6 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
@@ -3,12 +3,11 @@ package org.opengroup.osdu.indexer.middleware;
 import com.google.common.base.Strings;
 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.coreis.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.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.headers.ResponseHeaders;
+import org.opengroup.osdu.is.core.model.DeploymentEnvironment;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
@@ -27,7 +26,6 @@ import java.util.Map;
 public class IndexFilter implements Filter {
 
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders dpsHeaders;
 
     @Inject
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreCredential.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreCredential.java
index b0be2d933c28a7071f18c114ad43112c7469f92d..d8e77402049c23c309d5e1fc2e383ca13e8319f9 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreCredential.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreCredential.java
@@ -26,9 +26,9 @@ import com.google.auth.oauth2.AccessToken;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.gson.JsonObject;
 import org.apache.commons.lang3.time.DateUtils;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
-import org.opengroup.osdu.core.common.model.core.cryptographic.Crc32c;
 import org.opengroup.osdu.indexer.cache.DatastoreCredentialCache;
+import org.opengroup.osdu.core.cryptographic.Crc32c;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 
 import java.util.Date;
 
diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreFactory.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreFactory.java
index cdadd4513d7c8f1397a165a5b7039e50f05fa154..5cb5a9fdeee7fda7ca981179590e8a60cae783a2 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreFactory.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreFactory.java
@@ -19,8 +19,8 @@ import com.google.cloud.TransportOptions;
 import com.google.cloud.datastore.Datastore;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.http.HttpTransportOptions;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.indexer.cache.DatastoreCredentialCache;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.springframework.stereotype.Component;
 import org.threeten.bp.Duration;
 
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 00bd0b264a80a389466e9daac5ec27930f175f29..acfbfb4c12065c6377628369b18e807028938627 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
@@ -20,12 +20,12 @@ import com.google.cloud.datastore.Entity;
 import com.google.cloud.datastore.Key;
 import lombok.extern.java.Log;
 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.coreis.AppException;
-import org.opengroup.osdu.core.common.spi.coreis.IKmsClient;
-import org.opengroup.osdu.core.common.spi.coreis.ElasticRepository;
-import org.opengroup.osdu.core.common.service.coreis.Preconditions;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.kms.IKmsClient;
+import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticRepository;
+import org.opengroup.osdu.is.core.util.AppException;
+import org.opengroup.osdu.is.core.util.Preconditions;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import javax.inject.Inject;
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 80de942d3a14f169dc6a5c97c8b44a95d71e0ba5..e66424a5d43db1d5beaec9a2aa54cbce2e616927 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
@@ -27,15 +27,15 @@ import lombok.extern.java.Log;
 import org.apache.http.HttpStatus;
 import org.elasticsearch.common.Strings;
 
-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.coreis.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.model.RecordStatus;
+import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
+import org.opengroup.osdu.indexer.util.JobStatus;
+import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.core.gcp.PubSub.PubSubExtensions;
-import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.model.DeploymentEnvironment;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.beans.factory.annotation.Value;
 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/HeadersInfoGcpImpl.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImpl.java
index dfda1230144fc26ff657c67ea5db17ba86eab8a9..337ae032ccf2da39eddee17257f6aa21147d576c 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
@@ -16,12 +16,11 @@ package org.opengroup.osdu.indexer.util;
 
 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.api.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.service.coreis.Preconditions;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.is.core.model.SlbHeaders;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.util.Preconditions;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
@@ -36,7 +35,6 @@ import java.util.stream.Collectors;
 public class HeadersInfoGcpImpl implements IHeadersInfo {
 
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders headersMap;
 
     private static final HashSet<String> FORBIDDEN_FROM_LOGGING = new HashSet<>();
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 b9eb0641c286422f3a2e34cdccec680c9b381180..ca75dd2f72237c2a99d165d5b646fed5c9f8ff5d 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
@@ -3,16 +3,15 @@ package org.opengroup.osdu.indexer.util;
 import com.google.common.base.Strings;
 import lombok.extern.java.Log;
 import org.apache.http.HttpStatus;
-import org.opengroup.osdu.core.common.model.core.Constants;
-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.coreis.AppException;
-import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
-import org.opengroup.osdu.core.common.spi.coreis.IServiceAccountJwtClient;
+import org.opengroup.osdu.core.api.DpsHeaders;
 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.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.model.DeploymentEnvironment;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IServiceAccountJwtClient;
+import org.opengroup.osdu.is.core.util.AppException;
+import org.opengroup.osdu.is.core.util.Constants;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -20,7 +19,7 @@ import org.springframework.web.context.annotation.RequestScope;
 import javax.inject.Inject;
 import java.util.Map;
 
-import static org.opengroup.osdu.core.common.model.core.DpsHeaders.AUTHORIZATION;
+import static org.opengroup.osdu.core.api.DpsHeaders.AUTHORIZATION;
 
 
 @Log
@@ -29,7 +28,6 @@ import static org.opengroup.osdu.core.common.model.core.DpsHeaders.AUTHORIZATION
 public class RequestInfoImpl implements IRequestInfo {
 
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders dpsHeaders;
 
     @Inject
@@ -38,7 +36,6 @@ public class RequestInfoImpl implements IRequestInfo {
     private IServiceAccountJwtClient serviceAccountJwtClient;
 
     @Inject
-    @Qualifier("TenantInfoFactorySearch")
     private TenantInfo tenantInfo;
 
     @Value("${DEPLOYMENT_ENVIRONMENT}")
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 94e3a9eb634337ca17a176464c0667749715e84c..a953e6ce9a4ad069b379bbe916244cf432bbac67 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
@@ -38,15 +38,14 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
-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.coreis.AppException;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-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.IServiceAccountJwtClient;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+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.opengroup.osdu.is.core.util.AppException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -77,7 +76,6 @@ public class ServiceAccountJwtGcpClientImpl implements IServiceAccountJwtClient
     @Inject
     private JaxRsDpsLog log;
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders dpsHeaders;
 
     @Value("${GOOGLE_AUDIENCES}")
diff --git a/provider/indexer-gcp/src/main/resources/application.properties b/provider/indexer-gcp/src/main/resources/application.properties
index 1bd1930e1bed42ccb05561e81dc6d3350a85995f..e1b58c9466f562fd6cc171031e1bfa756ccdac8a 100644
--- a/provider/indexer-gcp/src/main/resources/application.properties
+++ b/provider/indexer-gcp/src/main/resources/application.properties
@@ -23,8 +23,8 @@ REDIS_SEARCH_PORT=6379
 DEFAULT_DATA_COUNTRY=US
 
 AUTHORIZE_API=https://entitlements-dot-opendes.appspot.com/entitlements/v1
-LEGALTAG_API=https://os-legal-dot-opendes.appspot.com/api/legal/v1
-CRS_API=https://crs-converter-gae-dot-opendes.appspot.com/api/crs/v1
+LEGALTAG_API=https://legal-dot-opendes.appspot.com/api/legal/v1
+CRS_API=https://crs-converter-dot-opendes.appspot.com/api/crs/v1
 
 
 #Default Cache Settings
@@ -44,8 +44,8 @@ CRON_EMPTY_INDEX_CLEANUP_THRESHOLD_DAYS=7
 GOOGLE_CLOUD_PROJECT=opendes
 GAE_SERVICE=indexer
 
-INDEXER_HOST=os-indexer-dot-opendes.appspot.com
-STORAGE_HOSTNAME=os-storage-dot-opendes.appspot.com
+#INDEXER_HOST=os-indexer-dot-opendes.appspot.com
+#STORAGE_HOSTNAME=os-storage-dot-opendes.appspot.com
 
 KEY_RING=csqp
 KMS_KEY=searchService
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 ac5ef25c8deaec83ebc39ccbbcfa822b6d14a00c..64ff9dce72c21188a79e7b58d644034b87d2d8a3 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
@@ -21,11 +21,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.model.coreis.IndexInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
-import org.opengroup.osdu.core.common.service.coreis.IndicesService;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.model.IndexInfo;
+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.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
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 2db0ead8bc641a7e60c68d0c99c464a65e4eba57..5b1537be663b540d2e022a6061b725f243d4d7e3 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
@@ -19,16 +19,14 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-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.coreis.AppException;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
-import org.opengroup.osdu.core.common.spi.coreis.ElasticRepository;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.service.coreis.TenantInfoService;
-import org.opengroup.osdu.indexer.IndexerApplication;
-import org.springframework.boot.test.context.SpringBootTest;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.IElasticCredentialsCache;
+import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticRepository;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.service.TenantInfoService;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.junit.Assert.assertEquals;
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 769ab010da20612998f932960ff65364417bdd01..e668eb9b3638ac78be4915a86fd7eb4e0fb90843 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
@@ -31,16 +31,16 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-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.coreis.AppException;
-import org.opengroup.osdu.core.common.model.indexer.AuditLogger;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.indexer.logging.AuditLogger;
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
 import org.opengroup.osdu.is.core.service.ElasticSettingService;
-import org.opengroup.osdu.core.common.service.coreis.IndicesService;
+import org.opengroup.osdu.is.core.service.IndicesService;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
-import org.opengroup.osdu.core.common.service.coreis.ElasticIndexNameResolver;
+import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceTest.java
index 0b6af7a0f9cf4111bad565bca5c2def5cbaf5467..b04435d54ac5b92d76bd5c0bfcf7b113af4751b7 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceTest.java
@@ -31,9 +31,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
-import org.opengroup.osdu.core.common.model.coreis.RecordMetaAttribute;
+import org.opengroup.osdu.indexer.model.IndexSchema;
+import org.opengroup.osdu.is.core.model.RecordMetaAttribute;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
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 9a7292cab4214a300936d4686cb70efbf6d0eae3..d58a9663db68d5f55d12ab407bdc39f4a8395240 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
@@ -22,15 +22,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.model.indexer.OperationType;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.indexer.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;
+import org.opengroup.osdu.indexer.model.IndexSchema;
+import org.opengroup.osdu.indexer.model.OperationType;
+import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache;
+import org.opengroup.osdu.is.core.httpclient.RequestStatus;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.service.IndicesService;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
-import org.opengroup.osdu.core.common.service.coreis.ElasticIndexNameResolver;
+import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
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 6f2806b3a4c84bf8fdfb0ff3f81e05cf156a8e2e..5c4d48b457f711325cab87903458463b399532be 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
@@ -21,12 +21,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.model.indexer.RecordQueryResponse;
-import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.indexer.model.RecordQueryResponse;
+import org.opengroup.osdu.indexer.model.RecordReindexRequest;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.provider.interfaces.util.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 d292453a98e983eaad8f297db78448a5f48306c5..0fbac108721ee2f27d8e7f197cb0c16ca0fff432 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
@@ -23,17 +23,17 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.model.indexer.JobStatus;
-import org.opengroup.osdu.core.common.model.indexer.RecordInfo;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.model.coreis.HttpResponse;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
-import org.opengroup.osdu.core.common.service.coreis.UrlFetchService;
-import org.opengroup.osdu.core.common.model.indexer.RecordQueryResponse;
-import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
-import org.opengroup.osdu.core.common.model.indexer.Records;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.is.core.httpclient.HttpResponse;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
+import org.opengroup.osdu.is.core.service.UrlFetchService;
+import org.opengroup.osdu.is.core.util.AppException;
+import org.opengroup.osdu.indexer.model.RecordQueryResponse;
+import org.opengroup.osdu.indexer.model.RecordReindexRequest;
+import org.opengroup.osdu.indexer.model.Records;
+import org.opengroup.osdu.indexer.util.JobStatus;
+import org.opengroup.osdu.indexer.util.RecordInfo;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.util.ReflectionTestUtils;
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 ef99a8a31264e0d761a0a6ec57e2f378e31dc760..199337eb2ad69a5123e94e5dcf4449df1546c0e5 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
@@ -20,11 +20,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-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.coreis.AppException;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.util.AppException;
 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/HeadersInfoGcpImplTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImplTest.java
index 0d3850b2476955a3cf0e1783c7128660e2ba6bff..c2296eb027b937ad44708df5057728380cc5a958 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImplTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImplTest.java
@@ -19,10 +19,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
+import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.core.gcp.model.AppEngineHeaders;
-import org.opengroup.osdu.core.common.model.coreis.SlbHeaders;
-import org.opengroup.osdu.core.common.service.coreis.HeadersUtil;
+import org.opengroup.osdu.is.core.model.SlbHeaders;
+import org.opengroup.osdu.is.core.util.HeadersUtil;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.LinkedMultiValueMap;
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 54d8f2c844fb598b7920abcd0d651e2ff8c91bea..fe8e4a6cf4efe7d88dcf8ac0e944f16beb977803 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
@@ -32,15 +32,15 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
-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.coreis.AppException;
-import org.opengroup.osdu.core.common.service.coreis.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.service.coreis.Config;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.model.DeploymentEnvironment;
+import org.opengroup.osdu.is.core.model.IdToken;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.IJwtCache;
+import org.opengroup.osdu.is.core.util.AppException;
+import org.opengroup.osdu.is.core.util.Config;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/TraceIdExtractorTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/TraceIdExtractorTest.java
index 971392d6029655e650ec69b8fa3055cab7b3727d..4f248003784c0e00548b26e2caaf3989ab48c4cf 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/TraceIdExtractorTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/TraceIdExtractorTest.java
@@ -16,7 +16,7 @@ package org.opengroup.osdu.indexer.util;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
+import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.core.gcp.model.AppEngineHeaders;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.LinkedMultiValueMap;
diff --git a/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/util/IBMHTTPClient.java b/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/util/IBMHTTPClient.java
new file mode 100644
index 0000000000000000000000000000000000000000..d5bca798c728cdb9d1d13a2b3fca96fd056f209c
--- /dev/null
+++ b/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/util/IBMHTTPClient.java
@@ -0,0 +1,25 @@
+package org.opengroup.osdu.util;
+
+import lombok.ToString;
+import lombok.extern.java.Log;
+
+import java.io.IOException;
+
+@Log
+@ToString
+public class GCPHTTPClient extends HTTPClient {
+
+    private static String token = null;
+
+    @Override
+    public synchronized String getAccessToken() {
+        if(token == null) {
+            try {
+                token = "Bearer " + JwtTokenUtil.getAccessToken();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return token;
+    }
+}
\ No newline at end of file