diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/ReindexApi.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/ReindexApi.java
index b4a7f30a05db4ad8d2422698eb582c61b8906f6c..caeeac9c9c13c3c5b9ce76611c99df0bdb9e3bd0 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/ReindexApi.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/api/ReindexApi.java
@@ -15,7 +15,7 @@
 package org.opengroup.osdu.indexer.api;
 
 import org.opengroup.osdu.core.common.model.coreis.SearchServiceRole;
-import org.opengroup.osdu.core.common.model.indexer.AuditLogger;
+import org.opengroup.osdu.indexer.logging.AuditLogger;
 import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
 import org.opengroup.osdu.indexer.service.ReindexService;
 import org.springframework.http.ResponseEntity;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
index d1ed704763085a32790b1fab4689b804ca1d0742..cf088510335316d24c74c0eb8c0c40b0e3d2f65c 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlements.java
@@ -23,8 +23,8 @@ import org.opengroup.osdu.core.common.model.coreis.AuthorizationResponse;
 import org.opengroup.osdu.core.common.service.core.HttpResponse;
 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.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.service.coreis.HeadersUtil;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.provider.interfaces.IAuthorizationService;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditEvents.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditEvents.java
new file mode 100644
index 0000000000000000000000000000000000000000..0530c5d4316af4ca91ebeafa55f08ad25c39adce
--- /dev/null
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditEvents.java
@@ -0,0 +1,218 @@
+// Copyright 2017-2019, Schlumberger
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.opengroup.osdu.indexer.logging;
+
+import com.google.common.base.Strings;
+import org.opengroup.osdu.core.common.service.logging.audit.AuditAction;
+import org.opengroup.osdu.core.common.service.logging.audit.AuditPayload;
+import org.opengroup.osdu.core.common.service.logging.audit.AuditStatus;
+
+import java.util.List;
+
+public class AuditEvents {
+
+    private static final String INDEX_CREATE_RECORD_ACTION_ID = "IN001";
+    private static final String INDEX_CREATE_RECORDS_SUCCESS = "Successfully created record in index";
+    private static final String INDEX_CREATE_RECORDS_FAILURE = "Failed creating record in index";
+
+    private static final String INDEX_UPDATE_RECORD_ACTION_ID = "IN002";
+    private static final String INDEX_UPDATE_RECORDS_SUCCESS = "Successfully updated record in index";
+    private static final String INDEX_UPDATE_RECORDS_FAILURE = "Failed updating record in index";
+
+    private static final String INDEX_DELETE_RECORD_ACTION_ID = "IN003";
+    private static final String INDEX_DELETE_RECORDS_SUCCESS = "Successfully deleted record in index";
+    private static final String INDEX_DELETE_RECORDS_FAILURE = "Failed deleting record in index";
+
+    private static final String INDEX_PURGE_RECORD_ACTION_ID = "IN004";
+
+    private static final String REINDEX_KIND_ACTION_ID = "IN007";
+    private static final String REINDEX_KIND_OPERATION = "Reindex kind";
+
+    private static final String COPY_INDEX_ACTION_ID = "IN008";
+    private static final String COPY_INDEX_OPERATION = "Copy index";
+
+    private static final String GET_TASK_STATUS_ACTION_ID = "IN009";
+    private static final String GET_TASK_STATUS_OPERATION = "Get task status";
+
+    private static final String RUN_JOB_ACTION_ID = "IN010";
+    private static final String RUN_JOB_MESSAGE_SUCCESS = "Index clean-up status job run success";
+
+    private static final String INDEX_MAPPING_UPDATE_ACTION_ID = "IN0011";
+    private static final String INDEX_MAPPING_UPDATE_SUCCESS = "Successfully updated index mapping";
+    private static final String INDEX_MAPPING_UPDATE_FAILURE = "Failed updating index mapping";
+
+    private final String user;
+
+    public AuditEvents(String user) {
+        if (Strings.isNullOrEmpty(user)) {
+            throw new IllegalArgumentException("User not provided for audit events.");
+        }
+        this.user = user;
+    }
+
+    public AuditPayload getIndexCreateRecordSuccessEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.CREATE)
+                .status(AuditStatus.SUCCESS)
+                .actionId(INDEX_CREATE_RECORD_ACTION_ID)
+                .message(INDEX_CREATE_RECORDS_SUCCESS)
+                .resources(resources)
+                .user(this.user)
+                .build();
+    }
+
+    public AuditPayload getIndexCreateRecordFailEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.CREATE)
+                .status(AuditStatus.FAILURE)
+                .actionId(INDEX_CREATE_RECORD_ACTION_ID)
+                .message(INDEX_CREATE_RECORDS_FAILURE)
+                .resources(resources)
+                .user(this.user)
+                .build();
+    }
+
+    public AuditPayload getIndexUpdateRecordSuccessEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.UPDATE)
+                .status(AuditStatus.SUCCESS)
+                .actionId(INDEX_UPDATE_RECORD_ACTION_ID)
+                .message(INDEX_UPDATE_RECORDS_SUCCESS)
+                .resources(resources)
+                .user(this.user)
+                .build();
+    }
+
+    public AuditPayload getIndexUpdateRecordFailEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.UPDATE)
+                .status(AuditStatus.FAILURE)
+                .actionId(INDEX_UPDATE_RECORD_ACTION_ID)
+                .message(INDEX_UPDATE_RECORDS_FAILURE)
+                .resources(resources)
+                .user(this.user)
+                .build();
+    }
+
+    public AuditPayload getIndexDeleteRecordSuccessEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.DELETE)
+                .status(AuditStatus.SUCCESS)
+                .actionId(INDEX_DELETE_RECORD_ACTION_ID)
+                .message(INDEX_DELETE_RECORDS_SUCCESS)
+                .resources(resources)
+                .user(this.user)
+                .build();
+    }
+
+    public AuditPayload getIndexDeleteRecordFailEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.DELETE)
+                .status(AuditStatus.FAILURE)
+                .actionId(INDEX_DELETE_RECORD_ACTION_ID)
+                .message(INDEX_DELETE_RECORDS_FAILURE)
+                .resources(resources)
+                .user(this.user)
+                .build();
+    }
+
+    public AuditPayload getIndexPurgeRecordSuccessEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.DELETE)
+                .status(AuditStatus.SUCCESS)
+                .actionId(INDEX_PURGE_RECORD_ACTION_ID)
+                .message(INDEX_DELETE_RECORDS_SUCCESS)
+                .resources(resources)
+                .user(this.user)
+                .build();
+    }
+
+    public AuditPayload getIndexPurgeRecordFailEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.DELETE)
+                .status(AuditStatus.FAILURE)
+                .actionId(INDEX_PURGE_RECORD_ACTION_ID)
+                .message(INDEX_DELETE_RECORDS_FAILURE)
+                .resources(resources)
+                .user(this.user)
+                .build();
+    }
+
+    public AuditPayload getReindexEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.CREATE)
+                .status(AuditStatus.SUCCESS)
+                .actionId(REINDEX_KIND_ACTION_ID)
+                .message(REINDEX_KIND_OPERATION)
+                .resources(resources)
+                .user(this.user)
+                .build();
+    }
+
+    public AuditPayload getCopyIndexEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.CREATE)
+                .status(AuditStatus.SUCCESS)
+                .actionId(COPY_INDEX_ACTION_ID)
+                .message(COPY_INDEX_OPERATION)
+                .resources(resources)
+                .user(this.user)
+                .build();
+    }
+
+    public AuditPayload getTaskStatusEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.READ)
+                .status(AuditStatus.SUCCESS)
+                .actionId(GET_TASK_STATUS_ACTION_ID)
+                .message(GET_TASK_STATUS_OPERATION)
+                .resources(resources)
+                .user(this.user)
+                .build();
+    }
+
+    public AuditPayload getIndexCleanUpJobRunEvent(List<String> resources) {
+        return AuditPayload.builder()
+                .action(AuditAction.JOB_RUN)
+                .status(AuditStatus.SUCCESS)
+                .user(this.user)
+                .actionId(RUN_JOB_ACTION_ID)
+                .message(RUN_JOB_MESSAGE_SUCCESS)
+                .resources(resources)
+                .build();
+    }
+
+    public AuditPayload getIndexMappingUpdateEvent(List<String> resources, boolean isSuccess) {
+        if (isSuccess) {
+            return AuditPayload.builder()
+                    .action(AuditAction.UPDATE)
+                    .status(AuditStatus.SUCCESS)
+                    .actionId(INDEX_MAPPING_UPDATE_ACTION_ID)
+                    .message(INDEX_MAPPING_UPDATE_SUCCESS)
+                    .resources(resources)
+                    .user(this.user)
+                    .build();
+        } else {
+            return AuditPayload.builder()
+                    .action(AuditAction.UPDATE)
+                    .status(AuditStatus.FAILURE)
+                    .actionId(INDEX_MAPPING_UPDATE_ACTION_ID)
+                    .message(INDEX_MAPPING_UPDATE_FAILURE)
+                    .resources(resources)
+                    .user(this.user)
+                    .build();
+        }
+    }
+}
\ No newline at end of file
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditLogger.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditLogger.java
new file mode 100644
index 0000000000000000000000000000000000000000..fe4922ef58b2a29ffccab739112133f54fd91a6c
--- /dev/null
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/logging/AuditLogger.java
@@ -0,0 +1,102 @@
+// Copyright 2017-2019, Schlumberger
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.opengroup.osdu.indexer.logging;
+
+import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.audit.AuditPayload;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.annotation.RequestScope;
+
+import javax.inject.Inject;
+import java.util.List;
+
+@Component
+@RequestScope
+public class AuditLogger {
+
+    @Inject
+    private JaxRsDpsLog logger;
+    @Inject
+    private IHeadersInfo headers;
+
+    private AuditEvents events = null;
+
+    private AuditEvents getAuditEvents() {
+        if (this.events == null) {
+            this.events = new AuditEvents(this.headers.getUser());
+        }
+        return this.events;
+    }
+
+    public void indexCreateRecordSuccess(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getIndexCreateRecordSuccessEvent(resources));
+    }
+
+    public void indexCreateRecordFail(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getIndexCreateRecordFailEvent(resources));
+    }
+
+    public void indexUpdateRecordSuccess(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getIndexUpdateRecordSuccessEvent(resources));
+    }
+
+    public void indexUpdateRecordFail(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getIndexUpdateRecordFailEvent(resources));
+    }
+
+    public void indexDeleteRecordSuccess(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getIndexDeleteRecordSuccessEvent(resources));
+    }
+
+    public void indexDeleteRecordFail(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getIndexDeleteRecordFailEvent(resources));
+    }
+
+    public void indexPurgeRecordSuccess(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getIndexPurgeRecordSuccessEvent(resources));
+    }
+
+    public void indexPurgeRecordFail(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getIndexPurgeRecordFailEvent(resources));
+    }
+
+    public void getReindex(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getReindexEvent(resources));
+    }
+
+    public void copyIndex(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getCopyIndexEvent(resources));
+    }
+
+    public void getTaskStatus(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getTaskStatusEvent(resources));
+    }
+
+    public void getIndexCleanUpJobRun(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getIndexCleanUpJobRunEvent(resources));
+    }
+
+    public void indexMappingUpdateSuccess(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getIndexMappingUpdateEvent(resources,true));
+    }
+    public void indexMappingUpdateFail(List<String> resources) {
+        this.writeLog(this.getAuditEvents().getIndexMappingUpdateEvent(resources,false));
+    }
+
+    private void writeLog(AuditPayload log) {
+        this.logger.audit(log);
+    }
+}
\ No newline at end of file
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java
index c40c040a4db5c11697fd26b744b7ccb41978a582..fc60b988bed1505e0898b7098b7918e7c83aab77 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/CronServiceImpl.java
@@ -20,7 +20,7 @@ import org.elasticsearch.client.ResponseException;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.coreis.IndexInfo;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.IndicesService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
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 f81483bc5d3dd6f199797e96e0c13ccc660fd2fc..983a7851f391e01202bb9295b8bc602ee0de3b74 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceImpl.java
@@ -18,7 +18,7 @@ import org.apache.http.HttpStatus;
 import org.opengroup.osdu.core.common.model.core.ClusterSettings;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository;
 import org.opengroup.osdu.core.common.provider.interfaces.IElasticCredentialsCache;
 import org.opengroup.osdu.core.common.service.coreis.ITenantInfoService;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java
index a1571ede28a175abc8af75aa859cc024ef8de2ec..8ae1bfd7034630f90b18b0b7392f4a0ea8f8c44a 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java
@@ -30,7 +30,7 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.service.coreis.*;
-import org.opengroup.osdu.core.common.model.indexer.AuditLogger;
+import org.opengroup.osdu.indexer.logging.AuditLogger;
 import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.opengroup.osdu.is.core.service.ElasticSettingService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
index 0285fc5444d565c7b79de17efe1eec692cac2173..04e8a8806607cbba383def7aa05b64694e3891f7 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java
@@ -19,10 +19,10 @@ import com.google.gson.Gson;
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.opengroup.osdu.core.common.model.AppException;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.opengroup.osdu.core.common.service.coreis.ElasticIndexNameResolver;
 import org.opengroup.osdu.core.common.service.coreis.IndicesService;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
 import org.opengroup.osdu.core.common.model.indexer.OperationType;
 import org.opengroup.osdu.core.common.model.indexer.Schema;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java
index ec6a957a38c8013b9dd31cb79d4566cbd7c6ad5b..db0094c6c5974ca12e80d6ee5bb993c83383b240 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java
@@ -40,7 +40,7 @@ import com.google.gson.Gson;
 import org.opengroup.osdu.core.common.model.core.Constants;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.coreis.RecordMetaAttribute;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.service.coreis.Preconditions;
 import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
 import org.opengroup.osdu.core.common.model.indexer.Records;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
index 520a42766cd6caff62f53f463064a8389cc5dd5f..3af261d18bd6e94342015d10750b80f1e559451a 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
@@ -35,8 +35,9 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.indexer.*;
 import org.opengroup.osdu.core.common.model.storage.ConversionStatus;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
+import org.opengroup.osdu.indexer.logging.AuditLogger;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
 import org.opengroup.osdu.core.common.model.coreis.RequestStatus;
 import org.opengroup.osdu.core.common.model.coreis.RecordChangedMessages;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java
index f2daf9878fc86122816cbf6422ed0bf086b63e56..69e4bfc56c9fe8eb3e67e7f5e1ea9605daeaddc4 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/ReindexServiceImpl.java
@@ -21,9 +21,9 @@ import org.apache.http.HttpStatus;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.indexer.OperationType;
-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.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
 import org.opengroup.osdu.core.common.model.indexer.RecordInfo;
 import org.opengroup.osdu.core.common.model.coreis.RecordChangedMessages;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
index b920987e4a84f480ef15d63d32fd1d5327db538f..fdb1cfe7efaa3102e68f443de0c87566ee025762 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
@@ -26,7 +26,7 @@ import org.opengroup.osdu.core.common.model.coreis.HttpResponse;
 import org.opengroup.osdu.core.common.model.coreis.RequestStatus;
 import org.opengroup.osdu.core.common.model.indexer.*;
 import org.opengroup.osdu.core.common.model.storage.ConversionStatus;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.service.coreis.IUrlFetchService;
 import org.opengroup.osdu.core.common.model.coreis.RecordMetaAttribute;
 import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
index 33b39c8c6d69dd655e5e02ad8e9034c7435742bf..3855d9e4c5eb12f9ad57e39714fea1ea36a7f592 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerQueueTaskBuilder.java
@@ -19,8 +19,8 @@ import com.google.gson.Gson;
 import lombok.extern.java.Log;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.coreis.CloudTaskRequest;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.coreis.HttpResponse;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.service.coreis.IUrlFetchService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/api/RecordIndexerApiTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/api/RecordIndexerApiTest.java
index 3ece948fc1b59e2e856ba0f464123d872caae9fa..7596a8bc42b2f81eaf95361356e7b55deca43c3b 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/api/RecordIndexerApiTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/api/RecordIndexerApiTest.java
@@ -23,8 +23,8 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.AppException;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.service.coreis.Config;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.service.IndexerService;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
 import org.opengroup.osdu.core.common.model.coreis.RecordChangedMessages;
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/api/ReindexApiTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/api/ReindexApiTest.java
index eda802f62da817fc23fbaa8f905aa03a39404857..212baccf067101cb90ed560284a60f0567be4f6c 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/api/ReindexApiTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/api/ReindexApiTest.java
@@ -20,7 +20,7 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opengroup.osdu.core.common.model.AppException;
-import org.opengroup.osdu.core.common.model.indexer.AuditLogger;
+import org.opengroup.osdu.indexer.logging.AuditLogger;
 import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
 import org.opengroup.osdu.indexer.service.ReindexService;
 
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlementsTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlementsTest.java
index 114b24dbc5212f8ee6e09f4af1f5cd48468f6ce7..fd375e3a2b0d971c90e39a0f439f29f844777ba4 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlementsTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/auth/AuthorizationServiceEntitlementsTest.java
@@ -27,8 +27,8 @@ import org.opengroup.osdu.core.common.model.core.entitlements.Groups;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.service.core.HttpResponse;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.coreis.AuthorizationResponse;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.ArrayList;
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditEventsTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditEventsTest.java
index 9a5b09a3a57da2f9be4ecfda697b5efe739f225b..3157d0e3a45ef1243a0af09a784b8897c4c0af73 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditEventsTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditEventsTest.java
@@ -17,9 +17,8 @@ package org.opengroup.osdu.indexer.logging;
 import com.google.common.collect.Lists;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.opengroup.osdu.core.common.model.core.AuditAction;
-import org.opengroup.osdu.core.common.model.core.AuditStatus;
-import org.opengroup.osdu.core.common.model.indexer.AuditEvents;
+import org.opengroup.osdu.core.common.service.logging.audit.AuditAction;
+import org.opengroup.osdu.core.common.service.logging.audit.AuditStatus;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.Map;
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
index 265fd9a65bb32592a4425ab97255d7dbe7339fba..1ac17b5308e49860835a6700d6e839e719345191 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/AuditLoggerTest.java
@@ -21,9 +21,8 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.AuditPayload;
-import org.opengroup.osdu.core.common.model.indexer.AuditLogger;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.audit.AuditPayload;
 import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.springframework.test.context.junit4.SpringRunner;
 
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/JaxRsDpsLogTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/JaxRsDpsLogTest.java
index ef56ebc87e094ea2945f2e6a3284339841986fd3..5b9c6a8688ccf2f52be0f0515cc0d30898009683 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/JaxRsDpsLogTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/logging/JaxRsDpsLogTest.java
@@ -20,12 +20,11 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.AuditPayload;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.core.IDpsLog;
 import org.opengroup.osdu.core.common.model.core.Request;
-import org.opengroup.osdu.core.common.model.indexer.ServiceLogId;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.ILogger;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.audit.AuditPayload;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -39,18 +38,15 @@ import static org.mockito.Mockito.*;
 
 @Ignore
 @RunWith(SpringRunner.class)
-@PrepareForTest({IDpsLog.class})
+@PrepareForTest({ILogger.class})
 public class JaxRsDpsLogTest {
 
     @Mock
-    private IDpsLog log;
+    private ILogger log;
 
     @InjectMocks
     private JaxRsDpsLog sut;
 
-    @InjectMocks
-    private ServiceLogId logId;
-
     @Test
     public void should_includeAllHeadersExceptAuth_when_writingALog() {
         this.sut.info("msg");
@@ -60,9 +56,6 @@ public class JaxRsDpsLogTest {
         assertEquals("cor123", argument.getValue().get(DpsHeaders.CORRELATION_ID));
         assertFalse(argument.getValue().containsKey("authorization"));
 
-        when(logId.getAppLog()).thenReturn("search.app");
-        when(logId.getAuditLog()).thenReturn("search.audit");
-        when(logId.getRequestLog()).thenReturn("search.request");
     }
 
     @Test
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java
index 8c369cb72b43c5f3b07467bdddf9d07bb929408b..df226bae0407dc26104d22d9dd8f45855432419e 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImplTest.java
@@ -20,7 +20,7 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opengroup.osdu.core.common.model.indexer.JobStatus;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.util.parser.DateTimeParser;
 import org.opengroup.osdu.indexer.util.parser.NumberParser;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java
index d2d19299c9dd3b68cd39e28a44ce28ef0e771f38..01cd911661833d718137c2dcc3646b067ba4f159 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/JobStatusTest.java
@@ -25,8 +25,8 @@ import org.opengroup.osdu.core.common.model.indexer.IndexingStatus;
 import org.opengroup.osdu.core.common.model.indexer.OperationType;
 import org.opengroup.osdu.core.common.model.indexer.RecordStatus;
 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.indexer.Records;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.lang.reflect.Type;
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/DpsLogFactory.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/DpsLogFactory.java
index cdf70a91473219c766ec72ebeb30790b8ba15d96..96f9f16e5d6d59bba4a37374b5b7218a6cfbd7fe 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/DpsLogFactory.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/DpsLogFactory.java
@@ -14,21 +14,21 @@
 
 package org.opengroup.osdu.indexer.aws.di;
 
-import org.opengroup.osdu.core.common.model.core.IDpsLog;
-import org.opengroup.osdu.core.common.service.core.Log;
+import org.opengroup.osdu.core.common.service.logging.DefaultLog;
+import org.opengroup.osdu.core.common.service.logging.ILogger;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.stereotype.Component;
 
 @Component
-public class DpsLogFactory extends AbstractFactoryBean<IDpsLog> {
+public class DpsLogFactory extends AbstractFactoryBean<ILogger> {
 
     @Override
-    protected IDpsLog createInstance() throws Exception {
-        return new Log();
+    protected ILogger createInstance() throws Exception {
+        return new DefaultLog();
     }
 
     @Override
     public Class<?> getObjectType() {
-        return IDpsLog.class;
+        return ILogger.class;
     }
 }
\ No newline at end of file
diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/EntitlementsServiceImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/EntitlementsServiceImpl.java
index 7f091c7a131af224bbd8d65539eb0f22bce5c579..e3bce2b2744f97ac940cd505c00d34f2448cb904 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/EntitlementsServiceImpl.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/EntitlementsServiceImpl.java
@@ -28,8 +28,8 @@ import org.opengroup.osdu.core.common.service.core.entitlements.IEntitlementsSer
 import org.opengroup.osdu.core.common.model.core.entitlements.*;
 import org.opengroup.osdu.core.aws.entitlements.*;
 import org.opengroup.osdu.core.common.service.core.HttpResponse;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.AppException;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
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 446a6985a71ad54681c4bd7bb9ce7c0a294515a8..3d1a30442fbfb12dad50ae0e36b88e611b4063e1 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,22 +14,22 @@
 
 package org.opengroup.osdu.indexer.azure.di;
 
-import org.opengroup.osdu.core.common.model.core.IDpsLog;
-import org.opengroup.osdu.core.common.service.core.Log;
+import org.opengroup.osdu.core.common.service.logging.DefaultLog;
+import org.opengroup.osdu.core.common.service.logging.ILogger;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
 @Component
 @RequestScope
-public class DpsLogFactory implements FactoryBean<IDpsLog> {
+public class DpsLogFactory implements FactoryBean<ILogger> {
     @Override
-    public IDpsLog getObject() throws Exception {
-        return new Log();
+    public ILogger getObject() throws Exception {
+        return new DefaultLog();
     }
 
     @Override
     public Class<?> getObjectType() {
-        return IDpsLog.class;
+        return ILogger.class;
     }
 }
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 be80fa344e698d90dab3c09edbb150668eae106c..4a8f4ee1476c0058faafe8e2555d78d6aaef91be 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java
@@ -27,7 +27,7 @@ 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.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
 import org.opengroup.osdu.core.common.model.coreis.RecordChangedMessages;
 import org.springframework.stereotype.Component;
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java
index 907b39b69aedfda15617fcb78754b8697d8df746..50b85eda79b2ca5088f5d27ce5c588153224aabf 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java
@@ -24,7 +24,7 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.core.ITenantFactory;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.azure.model.AADConfiguration;
 
 import org.opengroup.osdu.core.common.model.coreis.IdToken;
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 bc0c17095b053d23d670075df619cd2d98a3de4f..448d15fdd585c42d68b61564c8cb5dd810f03d7e 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/CronServiceImplTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/CronServiceImplTest.java
@@ -23,8 +23,8 @@ 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.logging.JaxRsDpsLog;
 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.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.IndicesService;
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 d45c81738d0596b29ee739afbedfd0909e139d4b..836c09bc122fa5a0e6c24e790466577af9573a36 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ElasticSettingServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ElasticSettingServiceTest.java
@@ -20,8 +20,8 @@ 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.common.service.logging.JaxRsDpsLog;
 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.provider.interfaces.IElasticCredentialsCache;
 import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository;
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 63286f477000a1655f72e85e42374a1adf6f9bf4..ae8bb1bea079c0883e59a50aad0bf0cdb0b8e134 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexCopyServiceImplTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexCopyServiceImplTest.java
@@ -31,7 +31,7 @@ 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.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;
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 19cec3eaeb682cc494bf450f207aa1370af49717..d7ebc39f0668c3feecdad565b5ec3c8fdfa8c82d 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerSchemaServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerSchemaServiceTest.java
@@ -25,12 +25,12 @@ 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.service.logging.JaxRsDpsLog;
 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.AppException;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
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 d0267adfa37a1f25876ae47368de3b5f895b9104..097e6b09f424b1170c2583d5763c764648b044cb 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ReindexServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ReindexServiceTest.java
@@ -26,10 +26,10 @@ 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.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.service.ReindexServiceImpl;
 import org.opengroup.osdu.indexer.service.StorageService;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.springframework.test.context.junit4.SpringRunner;
 
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 5284c8d9ab4c94fa5cf7864c5318f4d00754ac3f..349ec61dc13e4ac9fbfcc7a4d84d8c4303f168af 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java
@@ -28,10 +28,10 @@ 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.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.service.StorageServiceImpl;
 import org.opengroup.osdu.core.common.model.indexer.JobStatus;
 import org.opengroup.osdu.core.common.model.coreis.HttpResponse;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.IUrlFetchService;
 import org.opengroup.osdu.core.common.model.AppException;
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 dc061db69c503464d2894a9fe836b5ec07d80393..02ca735b7f6f8b1f7c9e2161cbdc8ad462289c14 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,7 +14,7 @@
 
 package org.opengroup.osdu.indexer.di;
 
-import org.opengroup.osdu.core.common.model.core.IDpsLog;
+import org.opengroup.osdu.core.common.service.logging.ILogger;
 import org.opengroup.osdu.core.gcp.logging.logger.AppEngineLoggingProvider;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.stereotype.Component;
@@ -22,17 +22,17 @@ import org.springframework.web.context.annotation.RequestScope;
 
 @Component
 @RequestScope
-public class DpsLogFactory extends AbstractFactoryBean<IDpsLog> {
+public class DpsLogFactory extends AbstractFactoryBean<ILogger> {
 
     private AppEngineLoggingProvider appEngineLoggingProvider = new AppEngineLoggingProvider();
 
     @Override
-    protected IDpsLog createInstance() throws Exception {
+    protected ILogger createInstance() throws Exception {
         return appEngineLoggingProvider.getLogger();
     }
 
     @Override
     public Class<?> getObjectType() {
-        return IDpsLog.class;
+        return ILogger.class;
     }
 }
\ No newline at end of file
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 ed023abed70a44f3202a973582eae3e4dae1d8a5..01a50d92848d9cdd0b9a64f3e25304bb5a10135e 100644
--- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java
+++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java
@@ -42,8 +42,8 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.core.ITenantFactory;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.core.common.model.AppException;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.coreis.IdToken;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.provider.interfaces.IJwtCache;
 import org.opengroup.osdu.core.common.provider.interfaces.IServiceAccountJwtClient;
 import org.springframework.beans.factory.annotation.Qualifier;
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 47ab481ac63a3241d8a3023120219efd1cb45c7d..8c865c36f94e9b3313e49d057285fcd3313f82bf 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/CronServiceImplTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/CronServiceImplTest.java
@@ -22,8 +22,8 @@ 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.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.IndicesService;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
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 6dc4cf82d35f84eac2e17d22592b4e676c67c82a..824e3a8abb8a85929c4a1a592af1f5f98d44d02a 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceTest.java
@@ -22,7 +22,7 @@ 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.AppException;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.provider.interfaces.IElasticCredentialsCache;
 import org.opengroup.osdu.core.common.provider.interfaces.IElasticRepository;
 import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
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 2c0c6fa900e3eb92d2dd4b89131ccdebc87997e6..e031ac73601e7115b1becf88f40d3eab30a2beba 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImplTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImplTest.java
@@ -34,7 +34,7 @@ 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.AppException;
-import org.opengroup.osdu.core.common.model.indexer.AuditLogger;
+import org.opengroup.osdu.indexer.logging.AuditLogger;
 import org.opengroup.osdu.core.common.provider.interfaces.IHeadersInfo;
 import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.is.core.service.ElasticSettingService;
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 9d63cc1119885ef67b5c444db933a9cb26cc1b25..76e377e91d4be52cb8973aee4545604b30a43e24 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java
@@ -24,7 +24,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.indexer.OperationType;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache;
 import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
 import org.opengroup.osdu.core.common.model.coreis.RequestStatus;
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 3b577dc2eda1ecb684f2858f4f775d36f55e2d30..23aa559004b206d4792751d3c1fe6fb0d8151471 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ReindexServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/ReindexServiceTest.java
@@ -22,9 +22,9 @@ 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.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
 import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.springframework.test.context.junit4.SpringRunner;
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 3020371e5af6a787fe8690cfc067ce6057326066..3ee648ed2abe700c35a58834ad27dcdce302e834 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceTest.java
@@ -27,8 +27,8 @@ import org.opengroup.osdu.core.common.model.core.DpsHeaders;
 import org.opengroup.osdu.core.common.model.AppException;
 import org.opengroup.osdu.core.common.model.indexer.JobStatus;
 import org.opengroup.osdu.core.common.model.indexer.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.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.provider.interfaces.IRequestInfo;
 import org.opengroup.osdu.core.common.service.coreis.IUrlFetchService;
 import org.opengroup.osdu.core.common.model.indexer.RecordQueryResponse;
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 0cc9febf447a289d3a4966b554db96801eb03462..3a96da54de824e9920773d234657edfc4cc76a99 100644
--- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImplTest.java
+++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImplTest.java
@@ -35,7 +35,7 @@ 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.AppException;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
+import org.opengroup.osdu.core.common.service.logging.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.service.TenantInfoServiceImpl;
 import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
 import org.opengroup.osdu.core.common.model.coreis.IdToken;