diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
index c6999a4232f91261e8e88e2f34ae8b91c3ca7267..71bee28d6cbb3e717ec2260359f5ad4f83950b75 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
@@ -15,8 +15,8 @@
 package org.opengroup.osdu.indexer.ibm.persistence;
 
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
 
+import org.opengroup.osdu.core.ibm.auth.ServiceCredentials;
 import org.opengroup.osdu.core.ibm.cloudant.IBMCloudantClientFactory;
 import org.opengroup.osdu.indexer.ibm.model.ElasticSettingSchema;
 import org.slf4j.Logger;
@@ -41,12 +41,10 @@ public class ElasticSettingSchemaRepositoryImpl implements ISchemaRepository {
 	
 	private Database db;
 	
-	@Inject
-	private IBMCloudantClientFactory cloudantFactory;
-
     @PostConstruct
     public void init(){
         try {
+        	IBMCloudantClientFactory cloudantFactory = new IBMCloudantClientFactory(new ServiceCredentials(url, apiKey));
         	db = cloudantFactory.getDatabase(dbNamePrefix, "SearchSettings");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -55,12 +53,12 @@ public class ElasticSettingSchemaRepositoryImpl implements ISchemaRepository {
 	
 	@Override 
 	public void add(ElasticSettingSchema schema, String id) {
-	  ElasticSettingsDoc sd = new ElasticSettingsDoc(); sd.setId(id);
+	  ElasticSettingsDoc sd = new ElasticSettingsDoc(); 
+	  sd.setId(id);
 	  sd.setSettingSchema(schema);
 	  db.save(sd);
 	}
 	 
-
     @Override
     public ElasticSettingSchema get(String id) {
     	if (db.contains(id)) {
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
index 2fbbe85e8efa792784f3384bbe911b21cc8834da..9cb0b9dab3d0823c1238fae6b0f3fc72796e9797 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
@@ -51,7 +51,7 @@ public class RequestInfoImpl implements IRequestInfo {
     private IServiceAccountJwtClient serviceAccountJwtClient;
 
     @Inject
-    @Qualifier("TenantInfoFactorySearch")
+    //@Qualifier("TenantInfoFactorySearch")
     private TenantInfo tenantInfo;
 
     @Value("${DEPLOYMENT_ENVIRONMENT}")