diff --git a/src/pages/taskmanager/components/task-detail/TaskDetailModal.tsx b/src/pages/taskmanager/components/task-detail/TaskDetailModal.tsx
index ae193c1..7c3e643 100644
--- a/src/pages/taskmanager/components/task-detail/TaskDetailModal.tsx
+++ b/src/pages/taskmanager/components/task-detail/TaskDetailModal.tsx
@@ -33,8 +33,14 @@ const TaskDetailModal: FC<Props> = ({ open, task, statusLabel, onClose }) => {
   const updateTask = useUpdateTask();
   const deleteTask = useDeleteTask();
 
-  const taskDetail: TaskDetailType | undefined =
-    getTaskDetail.data?.data?.task ?? getTaskDetail.data?.data;
+  const rawTaskDetail = getTaskDetail.data?.data?.task ?? getTaskDetail.data?.data;
+  const taskDetail: TaskDetailType | undefined = rawTaskDetail
+    ? {
+        ...rawTaskDetail,
+        id: rawTaskDetail.id ?? task?.id ?? "",
+        labels: rawTaskDetail.labels ?? rawTaskDetail.remarks,
+      }
+    : undefined;
 
   useEffect(() => {
     if (!open) {
@@ -128,7 +134,12 @@ const TaskDetailModal: FC<Props> = ({ open, task, statusLabel, onClose }) => {
           />
 
           <div className="mt-4">
-            <TaskDetailToolbar activeTab={activeTab} onTabChange={handleTabChange} taskDetail={taskDetail} />
+            <TaskDetailToolbar
+              activeTab={activeTab}
+              onTabChange={handleTabChange}
+              taskDetail={taskDetail}
+              taskId={task.id}
+            />
           </div>
 
           <TaskDetailDescription
diff --git a/src/pages/taskmanager/components/task-detail/TaskDetailToolbar.tsx b/src/pages/taskmanager/components/task-detail/TaskDetailToolbar.tsx
index 89ae14b..7eb248d 100644
--- a/src/pages/taskmanager/components/task-detail/TaskDetailToolbar.tsx
+++ b/src/pages/taskmanager/components/task-detail/TaskDetailToolbar.tsx
@@ -1,4 +1,6 @@
 import { type FC, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { toast } from "react-toastify";
 import TaskDetailAttachmentPopover from "./attachment/TaskDetailAttachmentPopover";
 import { DEFAULT_DATE_RANGE } from "./date/constants";
 import TaskDetailDatePopover from "./date/TaskDetailDatePopover";
@@ -9,7 +11,6 @@ import persian_fa from "react-date-object/locales/persian_fa";
 import { DEFAULT_CHECKLISTS } from "./checklist/constants";
 import TaskDetailChecklistPopover from "./checklist/TaskDetailChecklistPopover";
 import type { TaskChecklist } from "./checklist/types";
-import { DEFAULT_LABELS } from "./labels/constants";
 import TaskDetailLabelsPopover from "./labels/TaskDetailLabelsPopover";
 import type { LabelsView, TaskLabel } from "./labels/types";
 import TaskDetailActionBar from "./TaskDetailActionBar";
@@ -18,11 +19,14 @@ import type { TaskDetailTab } from "./types";
 import { DEFAULT_USERS } from "./users/constants";
 import TaskDetailUsersPopover from "./users/TaskDetailUsersPopover";
 import type { TaskDetailType } from "../../task/types/TaskTypes";
+import { useCreateTaskRemark } from "../../task/hooks/useTaskData";
+import { ErrorType } from "../../../../helpers/types";
 
 type Props = {
   activeTab: TaskDetailTab | null;
   onTabChange: (tab: TaskDetailTab) => void;
   taskDetail?: TaskDetailType;
+  taskId: string;
 };
 
 const parseDate = (value?: string): DateObject | null => {
@@ -31,10 +35,12 @@ const parseDate = (value?: string): DateObject | null => {
   return date.isValid ? date : null;
 };
 
-const TaskDetailToolbar: FC<Props> = ({ activeTab, onTabChange, taskDetail }) => {
+const TaskDetailToolbar: FC<Props> = ({ activeTab, onTabChange, taskDetail, taskId }) => {
+  const { t } = useTranslation("global");
+  const createTaskRemark = useCreateTaskRemark();
   const [labelsView, setLabelsView] = useState<LabelsView>("list");
-  const [labels, setLabels] = useState<TaskLabel[]>(DEFAULT_LABELS);
-  const [selectedLabelIds, setSelectedLabelIds] = useState<Set<string>>(new Set(["1"]));
+  const [labels, setLabels] = useState<TaskLabel[]>([]);
+  const [selectedLabelIds, setSelectedLabelIds] = useState<Set<string>>(new Set());
   const [selectedUserIds, setSelectedUserIds] = useState<Set<string>>(new Set(["1"]));
   const [checklists, setChecklists] = useState<TaskChecklist[]>(DEFAULT_CHECKLISTS);
   const [startDate, setStartDate] = useState<DateObject | null>(DEFAULT_DATE_RANGE.startDate);
@@ -43,9 +49,14 @@ const TaskDetailToolbar: FC<Props> = ({ activeTab, onTabChange, taskDetail }) =>
   useEffect(() => {
     if (!taskDetail) return;
 
-    if (taskDetail.labels?.length) {
-      setLabels(taskDetail.labels);
-      setSelectedLabelIds(new Set(taskDetail.labels.map((label) => label.id)));
+    const taskLabels = taskDetail.labels ?? taskDetail.remarks ?? [];
+
+    if (taskLabels.length) {
+      setLabels(taskLabels);
+      setSelectedLabelIds(new Set(taskLabels.map((label) => label.id)));
+    } else {
+      setLabels([]);
+      setSelectedLabelIds(new Set());
     }
 
     if (taskDetail.users?.length) {
@@ -108,14 +119,34 @@ const TaskDetailToolbar: FC<Props> = ({ activeTab, onTabChange, taskDetail }) =>
   };
 
   const handleCreate = (title: string, color: string) => {
-    const newLabel: TaskLabel = {
-      id: crypto.randomUUID(),
-      title,
-      color,
-    };
-    setLabels((prev) => [...prev, newLabel]);
-    setSelectedLabelIds((prev) => new Set([...prev, newLabel.id]));
-    setLabelsView("list");
+    const effectiveTaskId = taskId || taskDetail?.id;
+    if (!effectiveTaskId) return;
+
+    createTaskRemark.mutate(
+      { title, color, taskId: effectiveTaskId },
+      {
+        onSuccess: (response) => {
+          const remark =
+            response.data?.remark ??
+            (response as { remark?: TaskLabel }).remark ??
+            (response.data as TaskLabel | undefined);
+          if (remark?.id) {
+            const newLabel: TaskLabel = {
+              id: remark.id,
+              title: remark.title,
+              color: remark.color,
+            };
+            setLabels((prev) => [...prev, newLabel]);
+            setSelectedLabelIds((prev) => new Set([...prev, newLabel.id]));
+          }
+          setLabelsView("list");
+          toast.success(t("success"));
+        },
+        onError: (error: ErrorType) => {
+          toast.error(error.response?.data?.error.message[0]);
+        },
+      },
+    );
   };
 
   const handleChecklistClose = () => {
@@ -163,6 +194,7 @@ const TaskDetailToolbar: FC<Props> = ({ activeTab, onTabChange, taskDetail }) =>
               onViewChange={setLabelsView}
               onToggle={handleLabelToggle}
               onCreate={handleCreate}
+              isSubmitting={createTaskRemark.isPending}
             />
           ) : null
         }
diff --git a/src/pages/taskmanager/components/task-detail/labels/TaskDetailLabelsPopover.tsx b/src/pages/taskmanager/components/task-detail/labels/TaskDetailLabelsPopover.tsx
index 5daf2f8..134eff5 100644
--- a/src/pages/taskmanager/components/task-detail/labels/TaskDetailLabelsPopover.tsx
+++ b/src/pages/taskmanager/components/task-detail/labels/TaskDetailLabelsPopover.tsx
@@ -10,6 +10,7 @@ type Props = {
   onViewChange: (view: LabelsView) => void;
   onToggle: (id: string) => void;
   onCreate: (title: string, color: string) => void;
+  isSubmitting?: boolean;
 };
 
 const TaskDetailLabelsPopover: FC<Props> = ({
@@ -19,6 +20,7 @@ const TaskDetailLabelsPopover: FC<Props> = ({
   onViewChange,
   onToggle,
   onCreate,
+  isSubmitting = false,
 }) => {
   return (
     <>
@@ -34,6 +36,7 @@ const TaskDetailLabelsPopover: FC<Props> = ({
         <TaskDetailNewLabelForm
           onBack={() => onViewChange("list")}
           onSubmit={onCreate}
+          isSubmitting={isSubmitting}
         />
       )}
     </>
diff --git a/src/pages/taskmanager/components/task-detail/labels/TaskDetailNewLabelForm.tsx b/src/pages/taskmanager/components/task-detail/labels/TaskDetailNewLabelForm.tsx
index bfe9cdb..4c038cd 100644
--- a/src/pages/taskmanager/components/task-detail/labels/TaskDetailNewLabelForm.tsx
+++ b/src/pages/taskmanager/components/task-detail/labels/TaskDetailNewLabelForm.tsx
@@ -10,9 +10,10 @@ import { LABEL_COLOR_OPTIONS } from "./constants";
 type Props = {
   onBack: () => void;
   onSubmit: (title: string, color: string) => void;
+  isSubmitting?: boolean;
 };
 
-const TaskDetailNewLabelForm: FC<Props> = ({ onBack, onSubmit }) => {
+const TaskDetailNewLabelForm: FC<Props> = ({ onBack, onSubmit, isSubmitting = false }) => {
   const { t } = useTranslation("global");
   const colorInputRef = useRef<HTMLInputElement>(null);
   const [title, setTitle] = useState("");
@@ -48,7 +49,8 @@ const TaskDetailNewLabelForm: FC<Props> = ({ onBack, onSubmit }) => {
       <Button
         type="button"
         onClick={handleSubmit}
-        disabled={!title.trim()}
+        disabled={!title.trim() || isSubmitting}
+        isLoading={isSubmitting}
         className="flex items-center justify-center gap-2 bg-white border border-[#D0D0D0] text-[#292D32] rounded-[6px] h-7 text-xs disabled:opacity-50"
       >
         <AddCircle size={14} color="#292D32" />
diff --git a/src/pages/taskmanager/task/hooks/useTaskData.ts b/src/pages/taskmanager/task/hooks/useTaskData.ts
index bdc1b13..b70ef52 100644
--- a/src/pages/taskmanager/task/hooks/useTaskData.ts
+++ b/src/pages/taskmanager/task/hooks/useTaskData.ts
@@ -1,6 +1,6 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import * as api from "../service/TaskService";
-import { CreateTaskType, UpdateTaskType } from "../types/TaskTypes";
+import { CreateTaskRemarkType, CreateTaskType, UpdateTaskType } from "../types/TaskTypes";
 
 export const useGetTaskDetail = (id: string, enabled = true) => {
   return useQuery({
@@ -45,3 +45,15 @@ export const useDeleteTask = () => {
     },
   });
 };
+
+export const useCreateTaskRemark = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (variables: CreateTaskRemarkType) => api.createTaskRemark(variables),
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({ queryKey: ["task-detail", variables.taskId] });
+      queryClient.invalidateQueries({ queryKey: ["project"] });
+    },
+  });
+};
diff --git a/src/pages/taskmanager/task/service/TaskService.ts b/src/pages/taskmanager/task/service/TaskService.ts
index af8673d..f6b2968 100644
--- a/src/pages/taskmanager/task/service/TaskService.ts
+++ b/src/pages/taskmanager/task/service/TaskService.ts
@@ -1,5 +1,11 @@
 import axios from "../../../../config/axios";
-import { CreateTaskType, GetTaskDetailResponse, UpdateTaskType } from "../types/TaskTypes";
+import {
+  CreateTaskRemarkResponse,
+  CreateTaskRemarkType,
+  CreateTaskType,
+  GetTaskDetailResponse,
+  UpdateTaskType,
+} from "../types/TaskTypes";
 
 export const createTask = async (params: CreateTaskType) => {
   const { data } = await axios.post(`/task-manager/tasks`, params);
@@ -20,3 +26,8 @@ export const deleteTask = async (id: string) => {
   const { data } = await axios.delete(`/task-manager/tasks/${id}`);
   return data;
 };
+
+export const createTaskRemark = async (params: CreateTaskRemarkType): Promise<CreateTaskRemarkResponse> => {
+  const { data } = await axios.post(`/task-manager/remarks`, params);
+  return data;
+};
diff --git a/src/pages/taskmanager/task/types/TaskTypes.ts b/src/pages/taskmanager/task/types/TaskTypes.ts
index 9130e3b..ab30a78 100644
--- a/src/pages/taskmanager/task/types/TaskTypes.ts
+++ b/src/pages/taskmanager/task/types/TaskTypes.ts
@@ -25,6 +25,16 @@ export type TaskLabelType = {
   color: string;
 };
 
+export type CreateTaskRemarkType = {
+  title: string;
+  color: string;
+  taskId: string;
+};
+
+export interface CreateTaskRemarkResponse extends IResponse<{ remark: TaskLabelType }> {
+  statusCode: number;
+}
+
 export type TaskUserType = {
   id: string;
   firstName: string;
@@ -61,6 +71,7 @@ export type TaskDetailType = {
   startDate?: string;
   endDate?: string;
   labels?: TaskLabelType[];
+  remarks?: TaskLabelType[];
   users?: TaskUserType[];
   checklists?: TaskChecklistType[];
   attachments?: TaskAttachmentType[];