diff --git a/.github/workflows/release-cd.yml b/.github/workflows/release-cd.yml
index 52ac3d21..fa6dfc77 100644
--- a/.github/workflows/release-cd.yml
+++ b/.github/workflows/release-cd.yml
@@ -57,7 +57,7 @@ jobs:
           docker push ${{ secrets.DOCKER_REPO }}:latest
       - name: Update Kubernetes Deployment
         run: |
-          envsubst < ./taskflow.yaml
+          envsubst < ./taskflow.yaml > ./taskflow-back.yaml
         env:
           IMAGE_TAG: ${{ steps.version.outputs.VERSION }}
       # deploy
@@ -69,7 +69,7 @@ jobs:
           key: ${{ secrets.KUBE_HOST_KEY }}
           port: ${{ secrets.KUBE_HOST_PORT }}
           overwrite: true
-          source: ./taskflow.yaml
+          source: ./taskflow-back.yaml
           target: ~/taskflow-back.yaml
 
       - name: Deploy
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
index 7f9a026d..14d90e7d 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java
@@ -40,7 +40,7 @@ public class TaskCustomRepositoryImpl implements TaskCustomRepository {
     public Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
         BooleanBuilder builder = createFilter(filterTaskListRequest);
         if (!filterTaskListRequest.nickName().isEmpty()) {
-            builder.and(taskEntity.processor.nickname.contains(filterTaskListRequest.nickName()));
+            builder.and(taskEntity.processor.nickname.startsWith(filterTaskListRequest.nickName()));
         }
         builder.and(taskEntity.requester.memberId.eq(requesterId));
 
@@ -51,7 +51,7 @@ public Page<TaskEntity> findTasksRequestedByUser(Long requesterId, Pageable page
     public Page<TaskEntity> findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
         BooleanBuilder builder = createFilter(filterTaskListRequest);
         if (!filterTaskListRequest.nickName().isEmpty()) {
-            builder.and(taskEntity.requester.nickname.contains(filterTaskListRequest.nickName()));
+            builder.and(taskEntity.requester.nickname.startsWith(filterTaskListRequest.nickName()));
         }
         builder.and(taskEntity.processor.memberId.eq(processorId));
 
@@ -102,7 +102,7 @@ private BooleanBuilder createFilterBuilder(Long memberId, FilterTeamStatusReques
     public Page<TaskEntity> findPendingApprovalTasks(Pageable pageable, FilterTaskListRequest filterTaskListRequest) {
         BooleanBuilder builder = createFilter(filterTaskListRequest);
         if (!filterTaskListRequest.nickName().isEmpty()) {
-            builder.and(taskEntity.requester.nickname.contains(filterTaskListRequest.nickName()));
+            builder.and(taskEntity.requester.nickname.startsWith(filterTaskListRequest.nickName()));
         }
         builder.and(taskEntity.taskStatus.eq(TaskStatus.REQUESTED));
         return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection());
@@ -113,8 +113,8 @@ public Page<TaskEntity> findAllTasks(Pageable pageable, FilterTaskListRequest fi
         BooleanBuilder builder = createFilter(filterTaskListRequest);
         if (!filterTaskListRequest.nickName().isEmpty()) {
             builder.and(
-                    taskEntity.requester.nickname.contains(filterTaskListRequest.nickName())
-                            .or(taskEntity.processor.nickname.contains(filterTaskListRequest.nickName()))
+                    taskEntity.requester.nickname.startsWith(filterTaskListRequest.nickName())
+                            .or(taskEntity.processor.nickname.startsWith(filterTaskListRequest.nickName()))
             );
         }
         return getTasksPage(pageable, builder, filterTaskListRequest.sortBy(), filterTaskListRequest.sortDirection());
@@ -199,11 +199,10 @@ private Page<TaskEntity> getTasksPage(Pageable pageable, BooleanBuilder builder,
                 .limit(pageable.getPageSize())
                 .fetch();
         long total = queryFactory
-                .selectFrom(taskEntity)
-                .leftJoin(taskEntity.processor).fetchJoin()
-                .leftJoin(taskEntity.requester).fetchJoin()
+                .select(taskEntity.count())
+                .from(taskEntity)
                 .where(builder)
-                .fetch().size();
+                .fetchOne();
         return new PageImpl<>(result, pageable, total);
     }
 
diff --git a/src/main/resources/swagger.yml b/src/main/resources/swagger.yml
index ba0766b9..070a468c 100644
--- a/src/main/resources/swagger.yml
+++ b/src/main/resources/swagger.yml
@@ -34,7 +34,6 @@ springdoc:
   api-docs:
     path: /swagger/v3/api-docs
 
----
 ---
 spring.config.activate.on-profile: "prod"
 swagger.server.url: ${SWAGGER_SERVER_URL:http://localhost:8080}