diff --git a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt
index 850f6c90b..44a2ff3ec 100644
--- a/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt
+++ b/src/main/kotlin/org/opensearch/observability/action/CreateObservabilityObjectAction.kt
@@ -7,10 +7,10 @@ package org.opensearch.observability.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.transport.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
+import org.opensearch.transport.client.Client
 import org.opensearch.transport.TransportService
 
 /**
diff --git a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt
index fdee0b2b9..2abf483aa 100644
--- a/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt
+++ b/src/main/kotlin/org/opensearch/observability/action/DeleteObservabilityObjectAction.kt
@@ -7,10 +7,10 @@ package org.opensearch.observability.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.transport.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
+import org.opensearch.transport.client.Client
 import org.opensearch.transport.TransportService
 
 /**
diff --git a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt
index c19ff9c66..aa6d92d04 100644
--- a/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt
+++ b/src/main/kotlin/org/opensearch/observability/action/GetObservabilityObjectAction.kt
@@ -7,10 +7,10 @@ package org.opensearch.observability.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.transport.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
+import org.opensearch.transport.client.Client
 import org.opensearch.transport.TransportService
 
 /**
diff --git a/src/main/kotlin/org/opensearch/observability/action/PluginBaseAction.kt b/src/main/kotlin/org/opensearch/observability/action/PluginBaseAction.kt
index 3d9d58e87..ce4b6f666 100644
--- a/src/main/kotlin/org/opensearch/observability/action/PluginBaseAction.kt
+++ b/src/main/kotlin/org/opensearch/observability/action/PluginBaseAction.kt
@@ -13,7 +13,6 @@ import org.opensearch.OpenSearchStatusException
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.support.ActionFilters
 import org.opensearch.action.support.HandledTransportAction
-import org.opensearch.transport.client.Client
 import org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.action.ActionListener
@@ -28,6 +27,7 @@ import org.opensearch.observability.metrics.Metrics
 import org.opensearch.observability.security.SecurityAccess
 import org.opensearch.observability.util.logger
 import org.opensearch.tasks.Task
+import org.opensearch.transport.client.Client
 import org.opensearch.transport.TransportService
 import java.io.IOException
 
diff --git a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt
index 6d0ebc179..d5b10ff4d 100644
--- a/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt
+++ b/src/main/kotlin/org/opensearch/observability/action/UpdateObservabilityObjectAction.kt
@@ -7,10 +7,10 @@ package org.opensearch.observability.action
 
 import org.opensearch.action.ActionType
 import org.opensearch.action.support.ActionFilters
-import org.opensearch.transport.client.Client
 import org.opensearch.common.inject.Inject
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.xcontent.NamedXContentRegistry
+import org.opensearch.transport.client.Client
 import org.opensearch.transport.TransportService
 
 /**