diff --git a/.env b/.env
index 0312aab..fd19687 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 VITE_TOKEN_NAME = 'admin_token'
 VITE_REFRESH_TOKEN_NAME = 'admin_refresh_token'
-VITE_BASE_URL = 'https://api.danakcorp.com'
+# VITE_BASE_URL = 'https://api.danakcorp.com'
 
-# VITE_BASE_URL = 'http://192.168.99.131:3500'
\ No newline at end of file
+VITE_BASE_URL = 'http://192.168.99.131:3500'
\ No newline at end of file
diff --git a/src/pages/taskmanager/components/Task.tsx b/src/pages/taskmanager/components/Task.tsx
index 572bf55..3808124 100644
--- a/src/pages/taskmanager/components/Task.tsx
+++ b/src/pages/taskmanager/components/Task.tsx
@@ -4,6 +4,7 @@ import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { Pages } from "../../../config/Pages";
 import type { Task as TaskType } from "../types";
+import UserAvatar from "./UserAvatar";
 
 type Props = {
   task: TaskType;
@@ -70,9 +71,20 @@ const Task: FC<Props> = ({ task, isDragging, onClick }) => {
         </div>
       </div>
 
-      <div className="mt-2 flex justify-end">
-        <div className="size-6 bg-gray-200 rounded-full"></div>
-      </div>
+      {task.users?.length ? (
+        <div className="mt-2 flex justify-end">
+          <div className="flex items-center -space-x-1.5 rtl:space-x-reverse">
+            {task.users.map((user) => (
+              <UserAvatar
+                key={user.id}
+                src={user.profilePic}
+                alt={`${user.firstName} ${user.lastName}`}
+                className="size-6 ring-2 ring-white"
+              />
+            ))}
+          </div>
+        </div>
+      ) : null}
     </div>
   );
 };
diff --git a/src/pages/taskmanager/task/types/TaskTypes.ts b/src/pages/taskmanager/task/types/TaskTypes.ts
index 610a455..8a0d600 100644
--- a/src/pages/taskmanager/task/types/TaskTypes.ts
+++ b/src/pages/taskmanager/task/types/TaskTypes.ts
@@ -27,6 +27,7 @@ export type TaskItemType = {
   checklistDone?: number;
   checklistTotal?: number;
   ticketId?: string | null;
+  users?: TaskUserType[];
 };
 
 export type TaskPhaseTasksPagerType = {
diff --git a/src/pages/taskmanager/task/utils/mapTaskItemToTask.ts b/src/pages/taskmanager/task/utils/mapTaskItemToTask.ts
index aed53b3..4ae9319 100644
--- a/src/pages/taskmanager/task/utils/mapTaskItemToTask.ts
+++ b/src/pages/taskmanager/task/utils/mapTaskItemToTask.ts
@@ -13,4 +13,5 @@ export const mapTaskItemToTask = (task: TaskItemType, taskPhaseId: string, fallb
   checklistDone: task.checklistDone ?? 0,
   checklistTotal: task.checklistTotal ?? 0,
   ticketId: task.ticketId ?? null,
+  users: task.users ?? [],
 });
diff --git a/src/pages/taskmanager/types.ts b/src/pages/taskmanager/types.ts
index 44e1994..22f6649 100644
--- a/src/pages/taskmanager/types.ts
+++ b/src/pages/taskmanager/types.ts
@@ -1,3 +1,5 @@
+import type { TaskUserType } from "./task/types/TaskTypes";
+
 export type Column = {
   id: string;
   title: string;
@@ -17,6 +19,7 @@ export type Task = {
   checklistDone: number;
   checklistTotal: number;
   ticketId?: string | null;
+  users?: TaskUserType[];
 };
 
 export type WorkspaceData = {
diff --git a/src/pages/taskmanager/workspace.tsx b/src/pages/taskmanager/workspace.tsx
index 3dc7709..5075691 100644
--- a/src/pages/taskmanager/workspace.tsx
+++ b/src/pages/taskmanager/workspace.tsx
@@ -119,6 +119,7 @@ const Workspace: FC = () => {
           checklistDone: activeTask.checklistDone,
           checklistTotal: activeTask.checklistTotal,
           ticketId: activeTask.ticketId,
+          users: activeTask.users,
         },
         index,
       ),