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 3b599e030d5f639c34259baa191b247f6c2b677b..be30cfa5d2ba414b41a791f9d0b9f96957f50e44 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
@@ -24,6 +24,7 @@ import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticReposit
 import org.opengroup.osdu.is.core.service.ElasticSettingService;
 import org.opengroup.osdu.is.core.service.TenantInfoService;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import javax.inject.Inject;
 
@@ -37,6 +38,7 @@ public class ElasticSettingServiceImpl implements ElasticSettingService {
     @Inject
     private IElasticCredentialsCache elasticCredentialCache;
     @Inject
+    @Lazy
     private JaxRsDpsLog log;
 
     @Value("${GAE_SERVICE}")
diff --git a/provider/indexer-gcp/src/main/resources/application.properties b/provider/indexer-gcp/src/main/resources/application.properties
index 8426754d9e2845a948fcae463c27541c0a68bf99..e2ad3b5c5265e99ad843bb166ba8fc11b40d9065 100644
--- a/provider/indexer-gcp/src/main/resources/application.properties
+++ b/provider/indexer-gcp/src/main/resources/application.properties
@@ -23,7 +23,7 @@ REDIS_SEARCH_PORT=6379
 DEFAULT_DATA_COUNTRY=US
 
 AUTHORIZE_API=https://entitlements-dot-opendes.appspot.com/entitlements/v1
-LEGALTAG_API=https://legal-dot-opendes.appspot.com/api/legal/v1
+LEGALTAG_API=https://os-legal-dot-opendes.appspot.com/api/legal/v1
 CRS_API=https://crs-converter-dot-opendes.appspot.com/api/crs/v1