diff --git a/src/main/java/dev/lions/unionflow/server/client/RoleServiceClient.java b/src/main/java/dev/lions/unionflow/server/client/RoleServiceClient.java
index 628e742..a1202ec 100644
--- a/src/main/java/dev/lions/unionflow/server/client/RoleServiceClient.java
+++ b/src/main/java/dev/lions/unionflow/server/client/RoleServiceClient.java
@@ -14,7 +14,7 @@ import java.util.List;
  */
 @Path("/api/roles")
 @RegisterRestClient(configKey = "lions-user-manager-api")
-@RegisterClientHeaders(AdminServiceTokenHeadersFactory.class)
+@RegisterClientHeaders(OidcTokenPropagationHeadersFactory.class)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public interface RoleServiceClient {
diff --git a/src/main/java/dev/lions/unionflow/server/client/UserServiceClient.java b/src/main/java/dev/lions/unionflow/server/client/UserServiceClient.java
index 9fa980c..fb1b5f2 100644
--- a/src/main/java/dev/lions/unionflow/server/client/UserServiceClient.java
+++ b/src/main/java/dev/lions/unionflow/server/client/UserServiceClient.java
@@ -17,7 +17,7 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
  */
 @Path("/api/users")
 @RegisterRestClient(configKey = "lions-user-manager-api")
-@RegisterClientHeaders(AdminServiceTokenHeadersFactory.class)
+@RegisterClientHeaders(OidcTokenPropagationHeadersFactory.class)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public interface UserServiceClient {
diff --git a/src/main/java/dev/lions/unionflow/server/service/AdminUserService.java b/src/main/java/dev/lions/unionflow/server/service/AdminUserService.java
index fd50f3c..23a7a33 100644
--- a/src/main/java/dev/lions/unionflow/server/service/AdminUserService.java
+++ b/src/main/java/dev/lions/unionflow/server/service/AdminUserService.java
@@ -1,7 +1,8 @@
 package dev.lions.unionflow.server.service;
 
+import dev.lions.unionflow.server.client.AdminRoleServiceClient;
+import dev.lions.unionflow.server.client.AdminUserServiceClient;
 import dev.lions.unionflow.server.client.RoleServiceClient;
-import dev.lions.unionflow.server.client.UserServiceClient;
 import dev.lions.user.manager.dto.role.RoleDTO;
 import dev.lions.user.manager.dto.user.UserDTO;
 import dev.lions.user.manager.dto.user.UserSearchCriteriaDTO;
@@ -27,11 +28,11 @@ public class AdminUserService {
 
     @Inject
     @RestClient
-    UserServiceClient userServiceClient;
+    AdminUserServiceClient userServiceClient;
 
     @Inject
     @RestClient
-    RoleServiceClient roleServiceClient;
+    AdminRoleServiceClient roleServiceClient;
 
     public UserSearchResultDTO searchUsers(int page, int size, String searchTerm) {
         UserSearchCriteriaDTO criteria = UserSearchCriteriaDTO.builder()