diff --git a/client/src/components/DraggableTask.tsx b/client/src/components/DraggableTask.tsx
index ca131f7..9259d9d 100644
--- a/client/src/components/DraggableTask.tsx
+++ b/client/src/components/DraggableTask.tsx
@@ -40,6 +40,24 @@ const DraggableTask = ({
 			} ${task.id && remoteDrag?.draggableId === task.id.toString() ? "hidden" : ""} `}
 			style={{ ...provided.draggableProps.style }}
 		>
+			{task.labels && task.labels.length > 0 && (
+				<div className="mb-2 flex flex-wrap gap-2">
+					{task.labels.map((labelWrapper) => (
+						<div
+							key={labelWrapper.label.id}
+							className="truncate rounded-md px-3 py-1 text-sm font-bold text-white shadow-sm"
+							style={{
+								backgroundColor: labelWrapper.label.color,
+								border: "1px solid #333333",
+								boxShadow: `1px 1px 2px ${labelWrapper.label.color}aa`,
+								minWidth: "60px",
+								textAlign: "center",
+							}}
+							title={labelWrapper.label.name}
+						></div>
+					))}
+				</div>
+			)}
 			<div className="flex w-full items-center justify-between">
 				<span className="text-text-heading flex-grow p-1 font-medium break-words">
 					{task.title}
diff --git a/client/src/components/TaskDetailModal.tsx b/client/src/components/TaskDetailModal.tsx
index 747d0e2..0bef6fa 100644
--- a/client/src/components/TaskDetailModal.tsx
+++ b/client/src/components/TaskDetailModal.tsx
@@ -1,11 +1,13 @@
 import React, { useState, useEffect, useRef, useCallback } from "react";
-import type { Task } from "../pages/boards/types";
+import type { Label, Task } from "../pages/boards/types";
 import type { User } from "../pages/login/types";
 import { getBoardUsers } from "../pages/boards/service";
 import { Avatar } from "./ui/Avatar";
 import {
 	useAddAssigneeAction,
+	useAddLabelAction,
 	useRemoveAssigneeAction,
+	useRemoveLabelAction,
 } from "../store/boards/hooks";
 import type { Editor as TinyMCEEditor } from "tinymce";
 import { Editor } from "@tinymce/tinymce-react";
@@ -16,12 +18,16 @@ import { useAI } from "../hooks/useAI";
 import { CustomToast } from "./CustomToast";
 import toast from "react-hot-toast";
 import { SpinnerLoadingText } from "./ui/Spinner";
+import { getContrastColor } from "../lib/colorUtils";
 import ConfirmDelete from "./ui/modals/confirm-delete";
 import { useDismiss } from "../hooks/useDismissClickAndEsc";
+import { useAppDispatch } from "../../src/store";
+import { addLabel } from "../store/boards/actions";
 
 interface TaskDetailModalProps {
 	isOpen: boolean;
 	task: Task;
+	boardLabels?: Label[];
 	columnId: string;
 	boardId?: string;
 	onClose: () => void;
@@ -31,8 +37,50 @@ interface TaskDetailModalProps {
 	onDeleteTask: (columnId: string, taskId: string) => void;
 }
 
+const NewLabelForm: React.FC<{
+	boardId: string;
+}> = ({ boardId }) => {
+	const [name, setName] = useState("");
+	const [color, setColor] = useState("#cccccc");
+	const dispatch = useAppDispatch();
+
+	const handleCreate = async () => {
+		if (!name.trim()) return;
+		try {
+			await dispatch(addLabel(Number(boardId), { name, color } as Label));
+
+			setName("");
+			setColor("#cccccc");
+		} catch (error) {
+			console.error("Error creating label:", error);
+		}
+	};
+
+	return (
+		<div className="flex gap-2">
+			<input
+				type="color"
+				value={color}
+				onChange={(e) => setColor(e.target.value)}
+				className="h-10 w-10 rounded border p-0"
+			/>
+			<input
+				type="text"
+				value={name}
+				placeholder="Nombre"
+				onChange={(e) => setName(e.target.value)}
+				className="flex-grow rounded border px-2"
+			/>
+			<Button onClick={handleCreate} disabled={!name.trim()}>
+				<Icon icon="mdi:plus" />
+			</Button>
+		</div>
+	);
+};
+
 const TaskDetailModal: React.FC<TaskDetailModalProps> = ({
 	task,
+	boardLabels,
 	columnId,
 	boardId,
 	isOpen,
@@ -68,9 +116,13 @@ const TaskDetailModal: React.FC<TaskDetailModalProps> = ({
 
 	const contentInputRef = useRef<HTMLInputElement>(null);
 	const usersRef = useRef<HTMLDivElement>(null);
+	const labelsRef = useRef<HTMLDivElement>(null);
 	const addMenuRef = useRef<HTMLDivElement>(null);
 	const { t: translate } = useTranslation();
 	const editorRef = useRef<TinyMCEEditor | null>(null);
+	const [showLabels, setShowLabels] = useState(false);
+	const addLabelAction = useAddLabelAction();
+	const removeLabelAction = useRemoveLabelAction();
 
 	const {
 		generateDescriptionFromTitle,
@@ -402,10 +454,97 @@ const TaskDetailModal: React.FC<TaskDetailModalProps> = ({
 									/>
 								</div>
 
-								<Button className="bg-background-light-grey text-text-body hover:bg-background-hover-column flex items-center gap-1 rounded-md px-3 py-2 text-sm transition-colors duration-200">
+								<Button
+									onClick={() => setShowLabels(true)}
+									className="bg-background-light-grey text-text-body hover:bg-background-hover-column flex items-center gap-1 rounded-md px-3 py-2 text-sm transition-colors duration-200"
+								>
 									<Icon icon="mdi:tag-outline" className="text-lg" />{" "}
 									{translate("board.labels")}
 								</Button>
+								{showLabels && (
+									<div
+										ref={labelsRef}
+										className="border-border-medium bg-background-light-grey absolute top-full left-1/2 z-50 mt-2 max-h-60 -translate-x-1/2 overflow-y-auto rounded-md border p-2 shadow-lg"
+									>
+										<div className="mb-2 flex items-center justify-between">
+											<h3 className="text-text-heading text-sm font-semibold">
+												{translate("board.labels", "Etiquetas")}
+											</h3>
+											<Button
+												variant="primary"
+												onClick={() => setShowLabels(false)}
+												title={translate("board.close", "Cerrar")}
+											>
+												<Icon icon="mdi:close" className="text-lg" />
+											</Button>
+										</div>
+
+										{/* Lista de etiquetas */}
+										<div className="mb-2 space-y-1">
+											{boardLabels!.map((label) => {
+												const isAssigned = task.labels?.some(
+													(l) => l.label.id === label.id,
+												);
+												const contrastColor = getContrastColor(label.color);
+
+												return (
+													<div
+														key={label.id}
+														onClick={() => {
+															if (isAssigned && task.id && label.id) {
+																removeLabelAction(
+																	task.id.toString(),
+																	label.id.toString(),
+																);
+															} else if (task.id && label.id) {
+																addLabelAction(
+																	task.id.toString(),
+																	label.id.toString(),
+																);
+															}
+														}}
+														className={`flex cursor-pointer items-center justify-between rounded-md px-2 py-1 text-sm font-medium transition-colors duration-150 ${
+															isAssigned
+																? "ring-accent ring-1"
+																: "hover:bg-background-hover-column"
+														}`}
+														style={{
+															backgroundColor: isAssigned ? label.color : "",
+															color: isAssigned ? contrastColor : "inherit",
+														}}
+													>
+														<div
+															className="flex w-full items-center justify-center border"
+															style={{
+																backgroundColor: label.color,
+															}}
+														>
+															<span
+																className="truncate"
+																style={{ color: contrastColor }}
+															>
+																{label.name}
+															</span>
+														</div>
+
+														{isAssigned && (
+															<Icon
+																icon="mdi:check"
+																className="ml-2 shrink-0 text-xs"
+																style={{ color: contrastColor }}
+															/>
+														)}
+													</div>
+												);
+											})}
+										</div>
+
+										{/* Crear nueva etiqueta */}
+										<div className="border-border-medium border-t pt-2">
+											<NewLabelForm boardId={boardId!} />
+										</div>
+									</div>
+								)}
 								<Button className="bg-background-light-grey text-text-body hover:bg-background-hover-column flex items-center gap-1 rounded-md px-3 py-2 text-sm transition-colors duration-200">
 									<Icon icon="mdi:calendar-month-outline" className="text-lg" />{" "}
 									{translate("board.dates")}
diff --git a/client/src/lib/colorUtils.ts b/client/src/lib/colorUtils.ts
new file mode 100644
index 0000000..ad03db3
--- /dev/null
+++ b/client/src/lib/colorUtils.ts
@@ -0,0 +1,11 @@
+export function getContrastColor(hex: string): "black" | "white" {
+	const cleanHex = hex.replace("#", "");
+
+	const r = parseInt(cleanHex.substring(0, 2), 16);
+	const g = parseInt(cleanHex.substring(2, 4), 16);
+	const b = parseInt(cleanHex.substring(4, 6), 16);
+
+	const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
+
+	return luminance > 0.6 ? "black" : "white";
+}
diff --git a/client/src/pages/boards/board.tsx b/client/src/pages/boards/board.tsx
index 56736d3..817ba28 100644
--- a/client/src/pages/boards/board.tsx
+++ b/client/src/pages/boards/board.tsx
@@ -321,6 +321,7 @@ const Board = () => {
 				<TaskDetailModal
 					isOpen={!!selectedTask}
 					task={selectedTask}
+					boardLabels={boardData?.labels}
 					boardId={boardData?.id}
 					columnId={selectedColumnId}
 					onClose={closeTaskDetail}
diff --git a/client/src/pages/boards/service.ts b/client/src/pages/boards/service.ts
index 897e5f9..c3c3958 100644
--- a/client/src/pages/boards/service.ts
+++ b/client/src/pages/boards/service.ts
@@ -2,10 +2,11 @@ import { apiClient } from "../../api/client";
 import {
 	BOARD_ENDPOINTS,
 	CARD_ENDPOINT,
+	LABEL_ENDPOINTS,
 	LIST_ENDPOINT,
 } from "../../utils/endpoints";
 import type { User } from "../login/types";
-import type { Board, BoardsResponse, Column, Task } from "./types";
+import type { Board, BoardsResponse, Label, Column, Task } from "./types";
 
 export const getBoards = async (
 	page: number,
@@ -145,3 +146,37 @@ export const removeAssignee = async (
 		`${CARD_ENDPOINT.CARDS}/removeAssignee/${cardId}/${assigneeId}`,
 	);
 };
+
+export const getBoardLabels = async (
+	boardId: string | number,
+): Promise<Label[]> => {
+	const { data } = await apiClient.get<Label[]>(
+		LABEL_ENDPOINTS.BY_BOARD(boardId),
+	);
+	return data;
+};
+
+export const createLabel = async (
+	boardId: string | number,
+	label: Pick<Label, "name" | "color">,
+): Promise<Label> => {
+	const { data } = await apiClient.post<Label>(
+		LABEL_ENDPOINTS.BY_BOARD(boardId),
+		label,
+	);
+	return data;
+};
+
+export const addLabelToCard = async (cardId: number, labelId: number) => {
+	const { data } = await apiClient.post(
+		LABEL_ENDPOINTS.BY_CARD(cardId, labelId),
+	);
+	return data;
+};
+
+export const removeLabelFromCard = async (
+	cardId: number,
+	labelId: number,
+): Promise<void> => {
+	await apiClient.delete(LABEL_ENDPOINTS.BY_CARD(cardId, labelId));
+};
diff --git a/client/src/pages/boards/types.ts b/client/src/pages/boards/types.ts
index 21d728d..6b9d1f0 100644
--- a/client/src/pages/boards/types.ts
+++ b/client/src/pages/boards/types.ts
@@ -31,6 +31,7 @@ export type Task = {
 	position: number;
 	assignees: CardAssignee[];
 	media?: Media[];
+	labels: TaskLabel[];
 };
 
 export interface TaskWithMedia extends Task {
@@ -52,6 +53,7 @@ export type Board = {
 	lists: Column[];
 	members: BoardMember[];
 	image: string;
+	labels: Label[];
 };
 
 export type BoardsResponse = {
@@ -70,3 +72,16 @@ export type BoardMember = {
 	role: string;
 	user: User;
 };
+
+export interface Label {
+	id: number;
+	name: string;
+	color: string;
+	boardId: number;
+}
+
+export interface TaskLabel {
+	cardId: number;
+	labelId: number;
+	label: Label;
+}
diff --git a/client/src/store/boards/actions.ts b/client/src/store/boards/actions.ts
index e13c9cf..6d9f53a 100644
--- a/client/src/store/boards/actions.ts
+++ b/client/src/store/boards/actions.ts
@@ -1,483 +1,566 @@
-import type { AppThunk } from "..";
-import type { User } from "../../pages/login/types";
-import type { Board, Column, Task } from "../../pages/boards/types";
-import type { DropResult } from "@hello-pangea/dnd";
-import type { AuthActions, AuthActionsRejected } from "../auth/actions";
-import type {
-	ProfileActions,
-	ProfileActionsRejected,
-	UserActions,
-	UserActionsRejected,
-} from "../profile/actions";
-
-//
-// ─── BOARDS ──────────────────────────────────────────────
-//
-type UpdateRemoteBoard = {
-	type: "boards/update/remote";
-	payload: DropResult;
-};
-export const updateRemoteBoard = (result: DropResult): UpdateRemoteBoard => ({
-	type: "boards/update/remote",
-	payload: result,
-});
-
-type FetchBoardsPending = { type: "boards/fetchBoards/pending" };
-type FetchBoardsFulfilled = {
-	type: "boards/fetchBoards/fulfilled";
-	payload: {
-		boards: Board[];
-		pagination: {
-			page: number;
-			totalPages: number;
-			hasNextPage: boolean;
-			hasPrevPage: boolean;
-		};
-	};
-};
-type FetchBoardsRejected = {
-	type: "boards/fetchBoards/rejected";
-	payload: Error;
-};
-
-type FetchBoardPending = { type: "boards/fetchBoard/pending" };
-type FetchBoardFulfilled = {
-	type: "boards/fetchBoard/fulfilled";
-	payload: Board;
-};
-type FetchBoardRejected = {
-	type: "boards/fetchBoard/rejected";
-	payload: Error;
-};
-
-type GetBoardUsersPending = { type: "boards/getBoardUsers/pending" };
-type GetBoardUsersFulfilled = {
-	type: "boards/getBoardUsers/fulfilled";
-	payload: User[];
-};
-type GetBoardUsersRejected = {
-	type: "boards/getBoardUsers/rejected";
-	payload: Error;
-};
-
-type AddBoardFulfilled = { type: "boards/addBoard/fulfilled"; payload: Board };
-
-type DeleteBoardFulfilled = {
-	type: "boards/deleteBoards";
-	payload: string;
-};
-
-type EditBoardFulfilled = {
-	type: "boards/editBoard/fulfilled";
-	payload: { boardId: string; data: Board };
-};
-
-type EditBoardRejected = {
-	type: "boards/editBoard/rejected";
-	payload: Error;
-};
-
-type AddColumnFulfilled = {
-	type: "boards/addColumn/fulfilled";
-	payload: Column;
-};
-
-type EditColumnFulfilled = {
-	type: "boards/editColumn/fulfilled";
-	payload: { columnId: number; column: Column };
-};
-type EditColumnRejected = {
-	type: "boards/editColumn/rejected";
-	payload: Error;
-};
-type DeleteColumnFulfilled = {
-	type: "boards/deleteColumn/fulfilled";
-	payload: { columnId: string };
-};
-
-type AddTaskFulfilled = {
-	type: "boards/addTask/fulfilled";
-	payload: { columnId: number; task: Task };
-};
-
-type EditTaskFulfilled = {
-	type: "boards/editTask/fulfilled";
-	payload: { columnId: number; task: Task };
-};
-type EditTaskRejected = { type: "boards/editTask/rejected"; payload: Error };
-type DeleteTaskFulfilled = {
-	type: "boards/deleteTask/fulfilled";
-	payload: { columnId: string; taskId: string };
-};
-
-export const fetchBoardsPending = (): FetchBoardsPending => ({
-	type: "boards/fetchBoards/pending",
-});
-export const fetchBoardsFulfilled = (
-	payload: FetchBoardsFulfilled["payload"],
-): FetchBoardsFulfilled => ({
-	type: "boards/fetchBoards/fulfilled",
-	payload,
-});
-export const fetchBoardsRejected = (error: Error): FetchBoardsRejected => ({
-	type: "boards/fetchBoards/rejected",
-	payload: error,
-});
-
-export const fetchBoardPending = (): FetchBoardPending => ({
-	type: "boards/fetchBoard/pending",
-});
-export const fetchBoardFulfilled = (board: Board): FetchBoardFulfilled => ({
-	type: "boards/fetchBoard/fulfilled",
-	payload: board,
-});
-export const fetchBoardRejected = (error: Error): FetchBoardRejected => ({
-	type: "boards/fetchBoard/rejected",
-	payload: error,
-});
-
-export const getBoardUsersPending = (): GetBoardUsersPending => ({
-	type: "boards/getBoardUsers/pending",
-});
-export const getBoardUsersFulfilled = (
-	users: User[],
-): GetBoardUsersFulfilled => ({
-	type: "boards/getBoardUsers/fulfilled",
-	payload: users,
-});
-export const getBoardUsersRejected = (error: Error): GetBoardUsersRejected => ({
-	type: "boards/getBoardUsers/rejected",
-	payload: error,
-});
-
-export const addBoardFulfilled = (board: Board): AddBoardFulfilled => ({
-	type: "boards/addBoard/fulfilled",
-	payload: board,
-});
-
-export const editBoardFulfilled = (
-	boardId: string,
-	data: Board,
-): EditBoardFulfilled => ({
-	type: "boards/editBoard/fulfilled",
-	payload: { boardId, data },
-});
-
-export const editBoardRejected = (error: Error): EditBoardRejected => ({
-	type: "boards/editBoard/rejected",
-	payload: error,
-});
-
-export const addColumnFulfilled = (column: Column): AddColumnFulfilled => ({
-	type: "boards/addColumn/fulfilled",
-	payload: column,
-});
-
-export const editColumnFulfilled = (
-	columnId: number,
-	column: Column,
-): EditColumnFulfilled => ({
-	type: "boards/editColumn/fulfilled",
-	payload: { columnId, column },
-});
-export const editColumnRejected = (error: Error): EditColumnRejected => ({
-	type: "boards/editColumn/rejected",
-	payload: error,
-});
-
-export const deleteColumnFulfilled = (
-	columnId: string,
-): DeleteColumnFulfilled => ({
-	type: "boards/deleteColumn/fulfilled",
-	payload: { columnId },
-});
-
-export const addTaskFulfilled = (
-	columnId: number,
-	task: Task,
-): AddTaskFulfilled => ({
-	type: "boards/addTask/fulfilled",
-	payload: { columnId, task },
-});
-
-export const editTaskFulfilled = (
-	columnId: number,
-	task: Task,
-): EditTaskFulfilled => ({
-	type: "boards/editTask/fulfilled",
-	payload: { columnId, task },
-});
-export const editTaskRejected = (error: Error): EditTaskRejected => ({
-	type: "boards/editTask/rejected",
-	payload: error,
-});
-
-export const deleteTaskFulfilled = (
-	columnId: string,
-	taskId: string,
-): DeleteTaskFulfilled => ({
-	type: "boards/deleteTask/fulfilled",
-	payload: { columnId, taskId },
-});
-
-// ─── ASSIGNEES ──────────────────────────────────────────────
-
-type AddAssigneeFulfilled = {
-	type: "cards/addAssignee/fulfilled";
-	payload: { cardId: number; user: User };
-};
-
-type RemoveAssigneeFulfilled = {
-	type: "cards/removeAssignee/fulfilled";
-	payload: { cardId: number; userId: number };
-};
-
-export const addAssigneeFulfilled = (
-	cardId: number,
-	user: User,
-): AddAssigneeFulfilled => ({
-	type: "cards/addAssignee/fulfilled",
-	payload: { cardId, user },
-});
-
-export const removeAssigneeFulfilled = (
-	cardId: number,
-	userId: number,
-): RemoveAssigneeFulfilled => ({
-	type: "cards/removeAssignee/fulfilled",
-	payload: { cardId, userId },
-});
-
-// ─── UI ──────────────────────────────────────────────
-type UIResetError = {
-	type: "ui/reset-error";
-};
-
-export const uiResetError = (): UIResetError => ({
-	type: "ui/reset-error",
-});
-
-// ─── Thunks ─────────────────────────────
-export function fetchBoards({
-	page,
-	limit,
-}: {
-	page: number;
-	limit: number;
-}): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		const { loading, hasMore } = _getState().boards;
-
-		// Bloquea fetch si ya está cargando o si no hay más, excepto page 1
-		if (loading || (!hasMore && page !== 1)) return;
-		dispatch(fetchBoardsPending());
-		try {
-			const { pagination, boards } = await api.boards.getBoards(page, limit);
-			dispatch(fetchBoardsFulfilled({ pagination, boards }));
-		} catch (error) {
-			if (error instanceof Error) {
-				dispatch(fetchBoardsRejected(error));
-			}
-		}
-	};
-}
-
-export function fetchBoard(slug: string): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		dispatch(fetchBoardPending());
-		try {
-			const board = await api.boards.getBoard(slug);
-			dispatch(fetchBoardFulfilled(board));
-		} catch (error) {
-			if (error instanceof Error) {
-				dispatch(fetchBoardRejected(error));
-			}
-		}
-	};
-}
-
-export function getBoardUsers(id: string): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		dispatch(getBoardUsersPending());
-		try {
-			const users = await api.boards.getBoardUsers(id);
-			dispatch(getBoardUsersFulfilled(users));
-		} catch (error) {
-			if (error instanceof Error) {
-				dispatch(getBoardUsersRejected(error));
-			}
-		}
-	};
-}
-
-export function addBoard(data: FormData): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		const board = await api.boards.createBoard(data);
-		dispatch(addBoardFulfilled(board));
-	};
-}
-
-export function deleteBoard(boardId: string): AppThunk<Promise<void>> {
-	return async function (dispatch, _getState, { api }) {
-		await api.boards.deleteBoard(boardId);
-		dispatch({ type: "boards/deleteBoards", payload: boardId });
-	};
-}
-
-export function editBoard(
-	boardId: string,
-	data: FormData,
-): AppThunk<Promise<void>> {
-	return async function (dispatch, _getState, { api }) {
-		try {
-			const updatedBoard = await api.boards.updateBoard(boardId, data);
-			dispatch(editBoardFulfilled(boardId, updatedBoard));
-		} catch (error) {
-			if (error instanceof Error) {
-				dispatch(editBoardRejected(error));
-			}
-		}
-	};
-}
-
-export function addColumn(
-	boardId: string,
-	data: Column,
-): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		const column = await api.boards.createColumn(boardId, data);
-		dispatch(addColumnFulfilled(column));
-	};
-}
-
-export function editColumn(
-	columnId: number,
-	data: Partial<Column>,
-): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		try {
-			const updatedColumn = await api.boards.updateColumn(
-				columnId.toString(),
-				data,
-			);
-			dispatch(editColumnFulfilled(columnId, updatedColumn));
-		} catch (error) {
-			if (error instanceof Error) {
-				dispatch(editColumnRejected(error));
-			}
-		}
-	};
-}
-
-export function removeColumn(columnId: string): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		await api.boards.deleteColumn(columnId);
-		dispatch(deleteColumnFulfilled(columnId));
-	};
-}
-
-export function addTask(
-	columnId: number,
-	data: Partial<Task>,
-): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		const task = await api.boards.createTask(columnId, data);
-		dispatch(addTaskFulfilled(columnId, task));
-	};
-}
-
-export function editTask(
-	columnId: number,
-	taskId: string,
-	data: Partial<Task> | FormData,
-): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		try {
-			const updatedTask = await api.boards.updateTask(taskId, data);
-			dispatch(editTaskFulfilled(columnId, updatedTask));
-		} catch (error) {
-			if (error instanceof Error) {
-				dispatch(editTaskRejected(error));
-			}
-		}
-	};
-}
-
-export function removeTask(
-	columnId: string,
-	taskId: string,
-): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		await api.boards.deleteTask(taskId);
-		dispatch(deleteTaskFulfilled(columnId, taskId));
-	};
-}
-
-export function addAssignee(
-	cardId: number,
-	userId: number,
-): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		const user = await api.boards.addAssignee(cardId, userId);
-		dispatch(addAssigneeFulfilled(cardId, user));
-	};
-}
-
-export function removeAssignee(
-	cardId: number,
-	userId: number,
-): AppThunk<Promise<void>> {
-	return async (dispatch, _getState, { api }) => {
-		await api.boards.removeAssignee(cardId, userId);
-		dispatch(removeAssigneeFulfilled(cardId, userId));
-	};
-}
-
-//
-// ─── UI ──────────────────────────────────────────────
-//
-type UiResetError = { type: "ui/reset-error" };
-export const resetError = (): UiResetError => ({ type: "ui/reset-error" });
-
-//
-// ─── EXPORT TYPES ──────────────────────────────────────────────
-//
-export type Actions =
-	| AuthActions
-	| UserActions
-	| ProfileActions
-	| UpdateRemoteBoard
-	| FetchBoardsPending
-	| FetchBoardsFulfilled
-	| FetchBoardsRejected
-	| FetchBoardPending
-	| FetchBoardFulfilled
-	| FetchBoardRejected
-	| AddBoardFulfilled
-	| DeleteBoardFulfilled
-	| EditBoardFulfilled
-	| EditBoardRejected
-	| AddColumnFulfilled
-	| EditColumnFulfilled
-	| EditColumnRejected
-	| DeleteColumnFulfilled
-	| AddTaskFulfilled
-	| EditTaskFulfilled
-	| EditTaskRejected
-	| DeleteTaskFulfilled
-	| GetBoardUsersPending
-	| GetBoardUsersFulfilled
-	| GetBoardUsersRejected
-	| AddAssigneeFulfilled
-	| RemoveAssigneeFulfilled
-	| UiResetError;
-
-export type ActionsRejected =
-	| AuthActionsRejected
-	| UserActionsRejected
-	| ProfileActionsRejected
-	| FetchBoardsRejected
-	| FetchBoardRejected
-	| EditColumnRejected
-	| EditTaskRejected
-	| GetBoardUsersRejected;
+import type { AppThunk } from "..";
+import type { User } from "../../pages/login/types";
+import type { Board, Column, Label, Task } from "../../pages/boards/types";
+import type { DropResult } from "@hello-pangea/dnd";
+import type { AuthActions, AuthActionsRejected } from "../auth/actions";
+import type {
+	ProfileActions,
+	ProfileActionsRejected,
+	UserActions,
+	UserActionsRejected,
+} from "../profile/actions";
+
+//
+// ─── BOARDS ──────────────────────────────────────────────
+//
+type UpdateRemoteBoard = {
+	type: "boards/update/remote";
+	payload: DropResult;
+};
+export const updateRemoteBoard = (result: DropResult): UpdateRemoteBoard => ({
+	type: "boards/update/remote",
+	payload: result,
+});
+
+type FetchBoardsPending = { type: "boards/fetchBoards/pending" };
+type FetchBoardsFulfilled = {
+	type: "boards/fetchBoards/fulfilled";
+	payload: {
+		boards: Board[];
+		pagination: {
+			page: number;
+			totalPages: number;
+			hasNextPage: boolean;
+			hasPrevPage: boolean;
+		};
+	};
+};
+type FetchBoardsRejected = {
+	type: "boards/fetchBoards/rejected";
+	payload: Error;
+};
+
+type FetchBoardPending = { type: "boards/fetchBoard/pending" };
+type FetchBoardFulfilled = {
+	type: "boards/fetchBoard/fulfilled";
+	payload: Board;
+};
+type FetchBoardRejected = {
+	type: "boards/fetchBoard/rejected";
+	payload: Error;
+};
+
+type GetBoardUsersPending = { type: "boards/getBoardUsers/pending" };
+type GetBoardUsersFulfilled = {
+	type: "boards/getBoardUsers/fulfilled";
+	payload: User[];
+};
+type GetBoardUsersRejected = {
+	type: "boards/getBoardUsers/rejected";
+	payload: Error;
+};
+
+type AddBoardFulfilled = { type: "boards/addBoard/fulfilled"; payload: Board };
+
+type DeleteBoardFulfilled = {
+	type: "boards/deleteBoards";
+	payload: string;
+};
+
+type EditBoardFulfilled = {
+	type: "boards/editBoard/fulfilled";
+	payload: { boardId: string; data: Board };
+};
+
+type EditBoardRejected = {
+	type: "boards/editBoard/rejected";
+	payload: Error;
+};
+
+type AddColumnFulfilled = {
+	type: "boards/addColumn/fulfilled";
+	payload: Column;
+};
+
+type EditColumnFulfilled = {
+	type: "boards/editColumn/fulfilled";
+	payload: { columnId: number; column: Column };
+};
+type EditColumnRejected = {
+	type: "boards/editColumn/rejected";
+	payload: Error;
+};
+type DeleteColumnFulfilled = {
+	type: "boards/deleteColumn/fulfilled";
+	payload: { columnId: string };
+};
+
+type AddTaskFulfilled = {
+	type: "boards/addTask/fulfilled";
+	payload: { columnId: number; task: Task };
+};
+
+type EditTaskFulfilled = {
+	type: "boards/editTask/fulfilled";
+	payload: { columnId: number; task: Task };
+};
+type EditTaskRejected = { type: "boards/editTask/rejected"; payload: Error };
+type DeleteTaskFulfilled = {
+	type: "boards/deleteTask/fulfilled";
+	payload: { columnId: string; taskId: string };
+};
+
+type AddLabelToCardFulfilled = {
+	type: "tasks/addLabelToCard/fulfilled";
+	payload: { taskId: string; labelId: number };
+};
+
+type AddLabelFulfilled = {
+	type: "tasks/addLabel/fulfilled";
+	payload: { boardId: number; label: Label };
+};
+
+type RemoveLabelFromCardFulfilled = {
+	type: "tasks/removeLabelFromCard/fulfilled";
+	payload: { taskId: string; labelId: string };
+};
+
+export const fetchBoardsPending = (): FetchBoardsPending => ({
+	type: "boards/fetchBoards/pending",
+});
+export const fetchBoardsFulfilled = (
+	payload: FetchBoardsFulfilled["payload"],
+): FetchBoardsFulfilled => ({
+	type: "boards/fetchBoards/fulfilled",
+	payload,
+});
+export const fetchBoardsRejected = (error: Error): FetchBoardsRejected => ({
+	type: "boards/fetchBoards/rejected",
+	payload: error,
+});
+
+export const fetchBoardPending = (): FetchBoardPending => ({
+	type: "boards/fetchBoard/pending",
+});
+export const fetchBoardFulfilled = (board: Board): FetchBoardFulfilled => ({
+	type: "boards/fetchBoard/fulfilled",
+	payload: board,
+});
+export const fetchBoardRejected = (error: Error): FetchBoardRejected => ({
+	type: "boards/fetchBoard/rejected",
+	payload: error,
+});
+
+export const getBoardUsersPending = (): GetBoardUsersPending => ({
+	type: "boards/getBoardUsers/pending",
+});
+export const getBoardUsersFulfilled = (
+	users: User[],
+): GetBoardUsersFulfilled => ({
+	type: "boards/getBoardUsers/fulfilled",
+	payload: users,
+});
+export const getBoardUsersRejected = (error: Error): GetBoardUsersRejected => ({
+	type: "boards/getBoardUsers/rejected",
+	payload: error,
+});
+
+export const addBoardFulfilled = (board: Board): AddBoardFulfilled => ({
+	type: "boards/addBoard/fulfilled",
+	payload: board,
+});
+
+export const editBoardFulfilled = (
+	boardId: string,
+	data: Board,
+): EditBoardFulfilled => ({
+	type: "boards/editBoard/fulfilled",
+	payload: { boardId, data },
+});
+
+export const editBoardRejected = (error: Error): EditBoardRejected => ({
+	type: "boards/editBoard/rejected",
+	payload: error,
+});
+
+export const addColumnFulfilled = (column: Column): AddColumnFulfilled => ({
+	type: "boards/addColumn/fulfilled",
+	payload: column,
+});
+
+export const editColumnFulfilled = (
+	columnId: number,
+	column: Column,
+): EditColumnFulfilled => ({
+	type: "boards/editColumn/fulfilled",
+	payload: { columnId, column },
+});
+export const editColumnRejected = (error: Error): EditColumnRejected => ({
+	type: "boards/editColumn/rejected",
+	payload: error,
+});
+
+export const deleteColumnFulfilled = (
+	columnId: string,
+): DeleteColumnFulfilled => ({
+	type: "boards/deleteColumn/fulfilled",
+	payload: { columnId },
+});
+
+export const addTaskFulfilled = (
+	columnId: number,
+	task: Task,
+): AddTaskFulfilled => ({
+	type: "boards/addTask/fulfilled",
+	payload: { columnId, task },
+});
+
+export const editTaskFulfilled = (
+	columnId: number,
+	task: Task,
+): EditTaskFulfilled => ({
+	type: "boards/editTask/fulfilled",
+	payload: { columnId, task },
+});
+export const editTaskRejected = (error: Error): EditTaskRejected => ({
+	type: "boards/editTask/rejected",
+	payload: error,
+});
+
+export const deleteTaskFulfilled = (
+	columnId: string,
+	taskId: string,
+): DeleteTaskFulfilled => ({
+	type: "boards/deleteTask/fulfilled",
+	payload: { columnId, taskId },
+});
+
+// ─── ASSIGNEES ──────────────────────────────────────────────
+
+type AddAssigneeFulfilled = {
+	type: "cards/addAssignee/fulfilled";
+	payload: { cardId: number; user: User };
+};
+
+type RemoveAssigneeFulfilled = {
+	type: "cards/removeAssignee/fulfilled";
+	payload: { cardId: number; userId: number };
+};
+
+// --- LABELS
+
+export const addLabelToCardFulfilled = (
+	taskId: string,
+	labelId: number,
+): AddLabelToCardFulfilled => ({
+	type: "tasks/addLabelToCard/fulfilled",
+	payload: { taskId, labelId },
+});
+
+export const addLabelFulfilled = (
+	boardId: number,
+	label: Label,
+): AddLabelFulfilled => ({
+	type: "tasks/addLabel/fulfilled",
+	payload: { boardId, label },
+});
+
+export const removeLabelFromCardFulfilled = (
+	taskId: string,
+	labelId: string,
+): RemoveLabelFromCardFulfilled => ({
+	type: "tasks/removeLabelFromCard/fulfilled",
+	payload: { taskId, labelId },
+});
+
+export const addAssigneeFulfilled = (
+	cardId: number,
+	user: User,
+): AddAssigneeFulfilled => ({
+	type: "cards/addAssignee/fulfilled",
+	payload: { cardId, user },
+});
+
+export const removeAssigneeFulfilled = (
+	cardId: number,
+	userId: number,
+): RemoveAssigneeFulfilled => ({
+	type: "cards/removeAssignee/fulfilled",
+	payload: { cardId, userId },
+});
+
+// ─── UI ──────────────────────────────────────────────
+type UIResetError = {
+	type: "ui/reset-error";
+};
+
+export const uiResetError = (): UIResetError => ({
+	type: "ui/reset-error",
+});
+
+// ─── Thunks ─────────────────────────────
+export function fetchBoards({
+	page,
+	limit,
+}: {
+	page: number;
+	limit: number;
+}): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		const { loading, hasMore } = _getState().boards;
+
+		// Bloquea fetch si ya está cargando o si no hay más, excepto page 1
+		if (loading || (!hasMore && page !== 1)) return;
+		dispatch(fetchBoardsPending());
+		try {
+			const { pagination, boards } = await api.boards.getBoards(page, limit);
+			dispatch(fetchBoardsFulfilled({ pagination, boards }));
+		} catch (error) {
+			if (error instanceof Error) {
+				dispatch(fetchBoardsRejected(error));
+			}
+		}
+	};
+}
+
+export function fetchBoard(slug: string): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		dispatch(fetchBoardPending());
+		try {
+			const board = await api.boards.getBoard(slug);
+			dispatch(fetchBoardFulfilled(board));
+		} catch (error) {
+			if (error instanceof Error) {
+				dispatch(fetchBoardRejected(error));
+			}
+		}
+	};
+}
+
+export function getBoardUsers(id: string): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		dispatch(getBoardUsersPending());
+		try {
+			const users = await api.boards.getBoardUsers(id);
+			dispatch(getBoardUsersFulfilled(users));
+		} catch (error) {
+			if (error instanceof Error) {
+				dispatch(getBoardUsersRejected(error));
+			}
+		}
+	};
+}
+
+export function addBoard(data: FormData): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		const board = await api.boards.createBoard(data);
+		dispatch(addBoardFulfilled(board));
+	};
+}
+
+export function deleteBoard(boardId: string): AppThunk<Promise<void>> {
+	return async function (dispatch, _getState, { api }) {
+		await api.boards.deleteBoard(boardId);
+		dispatch({ type: "boards/deleteBoards", payload: boardId });
+	};
+}
+
+export function editBoard(
+	boardId: string,
+	data: FormData,
+): AppThunk<Promise<void>> {
+	return async function (dispatch, _getState, { api }) {
+		try {
+			const updatedBoard = await api.boards.updateBoard(boardId, data);
+			dispatch(editBoardFulfilled(boardId, updatedBoard));
+		} catch (error) {
+			if (error instanceof Error) {
+				dispatch(editBoardRejected(error));
+			}
+		}
+	};
+}
+
+export function addColumn(
+	boardId: string,
+	data: Column,
+): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		const column = await api.boards.createColumn(boardId, data);
+		dispatch(addColumnFulfilled(column));
+	};
+}
+
+export function editColumn(
+	columnId: number,
+	data: Partial<Column>,
+): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		try {
+			const updatedColumn = await api.boards.updateColumn(
+				columnId.toString(),
+				data,
+			);
+			dispatch(editColumnFulfilled(columnId, updatedColumn));
+		} catch (error) {
+			if (error instanceof Error) {
+				dispatch(editColumnRejected(error));
+			}
+		}
+	};
+}
+
+export function removeColumn(columnId: string): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		await api.boards.deleteColumn(columnId);
+		dispatch(deleteColumnFulfilled(columnId));
+	};
+}
+
+export function addTask(
+	columnId: number,
+	data: Partial<Task>,
+): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		const task = await api.boards.createTask(columnId, data);
+		dispatch(addTaskFulfilled(columnId, task));
+	};
+}
+
+export function editTask(
+	columnId: number,
+	taskId: string,
+	data: Partial<Task> | FormData,
+): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		try {
+			const updatedTask = await api.boards.updateTask(taskId, data);
+			dispatch(editTaskFulfilled(columnId, updatedTask));
+		} catch (error) {
+			if (error instanceof Error) {
+				dispatch(editTaskRejected(error));
+			}
+		}
+	};
+}
+
+export function removeTask(
+	columnId: string,
+	taskId: string,
+): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		await api.boards.deleteTask(taskId);
+		dispatch(deleteTaskFulfilled(columnId, taskId));
+	};
+}
+
+export function addAssignee(
+	cardId: number,
+	userId: number,
+): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		const user = await api.boards.addAssignee(cardId, userId);
+		dispatch(addAssigneeFulfilled(cardId, user));
+	};
+}
+
+export function removeAssignee(
+	cardId: number,
+	userId: number,
+): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		await api.boards.removeAssignee(cardId, userId);
+		dispatch(removeAssigneeFulfilled(cardId, userId));
+	};
+}
+
+export function addLabel(
+	boardId: number,
+	label: Label,
+): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		const data = await api.boards.createLabel(boardId, {
+			name: label.name,
+			color: label.color,
+		});
+		dispatch(addLabelFulfilled(boardId, data));
+	};
+}
+
+export function addLabelToCard(
+	taskId: string,
+	labelId: string,
+): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		const task = await api.boards.addLabelToCard(
+			Number(taskId),
+			Number(labelId),
+		);
+		if (!task) {
+			return;
+		}
+		dispatch(addLabelToCardFulfilled(taskId, task.labelId));
+	};
+}
+
+export function removeLabelFromCard(
+	taskId: string,
+	labelId: string,
+): AppThunk<Promise<void>> {
+	return async (dispatch, _getState, { api }) => {
+		await api.boards.removeLabelFromCard(Number(taskId), Number(labelId));
+		dispatch(removeLabelFromCardFulfilled(taskId, labelId));
+	};
+}
+
+//
+// ─── UI ──────────────────────────────────────────────
+//
+type UiResetError = { type: "ui/reset-error" };
+export const resetError = (): UiResetError => ({ type: "ui/reset-error" });
+
+//
+// ─── EXPORT TYPES ──────────────────────────────────────────────
+//
+export type Actions =
+	| AuthActions
+	| UserActions
+	| ProfileActions
+	| UpdateRemoteBoard
+	| FetchBoardsPending
+	| FetchBoardsFulfilled
+	| FetchBoardsRejected
+	| FetchBoardPending
+	| FetchBoardFulfilled
+	| FetchBoardRejected
+	| AddBoardFulfilled
+	| DeleteBoardFulfilled
+	| EditBoardFulfilled
+	| EditBoardRejected
+	| AddColumnFulfilled
+	| EditColumnFulfilled
+	| EditColumnRejected
+	| DeleteColumnFulfilled
+	| AddTaskFulfilled
+	| EditTaskFulfilled
+	| EditTaskRejected
+	| DeleteTaskFulfilled
+	| GetBoardUsersPending
+	| GetBoardUsersFulfilled
+	| GetBoardUsersRejected
+	| AddAssigneeFulfilled
+	| RemoveAssigneeFulfilled
+	| AddLabelToCardFulfilled
+	| AddLabelFulfilled
+	| RemoveLabelFromCardFulfilled
+	| UiResetError;
+
+export type ActionsRejected =
+	| AuthActionsRejected
+	| UserActionsRejected
+	| ProfileActionsRejected
+	| FetchBoardsRejected
+	| FetchBoardRejected
+	| EditColumnRejected
+	| EditTaskRejected
+	| GetBoardUsersRejected;
diff --git a/client/src/store/boards/hooks.ts b/client/src/store/boards/hooks.ts
index 23a3927..f82418f 100644
--- a/client/src/store/boards/hooks.ts
+++ b/client/src/store/boards/hooks.ts
@@ -1,156 +1,171 @@
-import { useCallback } from "react";
-import { useAppDispatch, useAppSelector } from "..";
-import type { Column, Task } from "../../pages/boards/types";
-import {
-	fetchBoards,
-	fetchBoard,
-	addBoard,
-	addColumn,
-	removeColumn,
-	addTask,
-	editTask,
-	removeTask,
-	editColumn,
-	addAssignee,
-	removeAssignee,
-	updateRemoteBoard,
-	uiResetError,
-} from "./actions";
-import {
-	getBoards,
-	getCurrentBoard,
-	getBoardsLoading,
-	getBoardsError,
-	getUiPending,
-	getUiError,
-} from "./selectors";
-import type { DropResult } from "@hello-pangea/dnd";
-
-//
-// ─── BOARDS HOOKS ──────────────────────────────────────────────
-//
-export function useBoards() {
-	return useAppSelector(getBoards);
-}
-
-export function useCurrentBoard() {
-	return useAppSelector(getCurrentBoard);
-}
-
-export function useBoardsLoading() {
-	return useAppSelector(getBoardsLoading);
-}
-
-export function useBoardsError() {
-	return useAppSelector(getBoardsError);
-}
-
-export function useFetchBoardsAction() {
-	const dispatch = useAppDispatch();
-	return function (page: number, limit: number) {
-		return dispatch(fetchBoards({ page, limit }));
-	};
-}
-
-export function useFetchBoardByIdAction() {
-	const dispatch = useAppDispatch();
-	return useCallback(
-		(slug: string) => {
-			dispatch(fetchBoard(slug));
-		},
-		[dispatch],
-	);
-}
-
-export function useUpdateBoardRemote() {
-	const dispatch = useAppDispatch();
-	return function (result: DropResult) {
-		return dispatch(updateRemoteBoard(result));
-	};
-}
-
-export function useAddBoardAction() {
-	const dispatch = useAppDispatch();
-	return function (board: FormData) {
-		return dispatch(addBoard(board));
-	};
-}
-
-export function useAddColumnAction() {
-	const dispatch = useAppDispatch();
-	return function (boardId: string, column: Column) {
-		return dispatch(addColumn(boardId, column));
-	};
-}
-
-export function useUpdateColumnAction() {
-	const dispatch = useAppDispatch();
-	return function (columnId: number, column: Partial<Column>) {
-		return dispatch(editColumn(columnId, column));
-	};
-}
-
-export function useDeleteColumnAction() {
-	const dispatch = useAppDispatch();
-	return function (columnId: string) {
-		return dispatch(removeColumn(columnId));
-	};
-}
-
-export function useAddTaskAction() {
-	const dispatch = useAppDispatch();
-	return function (columnId: number, task: Partial<Task>) {
-		return dispatch(addTask(columnId, task));
-	};
-}
-
-export function useUpdateTaskAction() {
-	const dispatch = useAppDispatch();
-	return function (
-		columnId: number,
-		taskId: string,
-		task: Partial<Task> | FormData,
-	) {
-		return dispatch(editTask(columnId, taskId, task));
-	};
-}
-
-export function useDeleteTaskction() {
-	const dispatch = useAppDispatch();
-	return function (columnId: string, taskId: string) {
-		return dispatch(removeTask(columnId, taskId));
-	};
-}
-
-// ─── ASSIGNEES ────────────────────────────────
-export function useAddAssigneeAction() {
-	const dispatch = useAppDispatch();
-	return function (cardId: number, userId: number) {
-		return dispatch(addAssignee(cardId, userId));
-	};
-}
-
-export function useRemoveAssigneeAction() {
-	const dispatch = useAppDispatch();
-	return function (cardId: number, userId: number) {
-		return dispatch(removeAssignee(cardId, userId));
-	};
-}
-
-//
-// ─── UI HOOKS ──────────────────────────────────────────────
-//
-export function useUiPending() {
-	return useAppSelector(getUiPending);
-}
-
-export function useUiError() {
-	return useAppSelector(getUiError);
-}
-
-export function useUiResetError() {
-	const dispatch = useAppDispatch();
-	return function () {
-		return dispatch(uiResetError());
-	};
-}
+import { useCallback } from "react";
+import { useAppDispatch, useAppSelector } from "..";
+import type { Column, Task } from "../../pages/boards/types";
+import {
+	fetchBoards,
+	fetchBoard,
+	addBoard,
+	addColumn,
+	removeColumn,
+	addTask,
+	editTask,
+	removeTask,
+	editColumn,
+	addAssignee,
+	removeAssignee,
+	updateRemoteBoard,
+	uiResetError,
+	removeLabelFromCard,
+	addLabelToCard,
+} from "./actions";
+import {
+	getBoards,
+	getCurrentBoard,
+	getBoardsLoading,
+	getBoardsError,
+	getUiPending,
+	getUiError,
+} from "./selectors";
+import type { DropResult } from "@hello-pangea/dnd";
+
+//
+// ─── BOARDS HOOKS ──────────────────────────────────────────────
+//
+export function useBoards() {
+	return useAppSelector(getBoards);
+}
+
+export function useCurrentBoard() {
+	return useAppSelector(getCurrentBoard);
+}
+
+export function useBoardsLoading() {
+	return useAppSelector(getBoardsLoading);
+}
+
+export function useBoardsError() {
+	return useAppSelector(getBoardsError);
+}
+
+export function useFetchBoardsAction() {
+	const dispatch = useAppDispatch();
+	return function (page: number, limit: number) {
+		return dispatch(fetchBoards({ page, limit }));
+	};
+}
+
+export function useFetchBoardByIdAction() {
+	const dispatch = useAppDispatch();
+	return useCallback(
+		(slug: string) => {
+			dispatch(fetchBoard(slug));
+		},
+		[dispatch],
+	);
+}
+
+export function useUpdateBoardRemote() {
+	const dispatch = useAppDispatch();
+	return function (result: DropResult) {
+		return dispatch(updateRemoteBoard(result));
+	};
+}
+
+export function useAddBoardAction() {
+	const dispatch = useAppDispatch();
+	return function (board: FormData) {
+		return dispatch(addBoard(board));
+	};
+}
+
+export function useAddColumnAction() {
+	const dispatch = useAppDispatch();
+	return function (boardId: string, column: Column) {
+		return dispatch(addColumn(boardId, column));
+	};
+}
+
+export function useUpdateColumnAction() {
+	const dispatch = useAppDispatch();
+	return function (columnId: number, column: Partial<Column>) {
+		return dispatch(editColumn(columnId, column));
+	};
+}
+
+export function useDeleteColumnAction() {
+	const dispatch = useAppDispatch();
+	return function (columnId: string) {
+		return dispatch(removeColumn(columnId));
+	};
+}
+
+export function useAddTaskAction() {
+	const dispatch = useAppDispatch();
+	return function (columnId: number, task: Partial<Task>) {
+		return dispatch(addTask(columnId, task));
+	};
+}
+
+export function useUpdateTaskAction() {
+	const dispatch = useAppDispatch();
+	return function (
+		columnId: number,
+		taskId: string,
+		task: Partial<Task> | FormData,
+	) {
+		return dispatch(editTask(columnId, taskId, task));
+	};
+}
+
+export function useDeleteTaskction() {
+	const dispatch = useAppDispatch();
+	return function (columnId: string, taskId: string) {
+		return dispatch(removeTask(columnId, taskId));
+	};
+}
+
+// ─── ASSIGNEES ────────────────────────────────
+export function useAddAssigneeAction() {
+	const dispatch = useAppDispatch();
+	return function (cardId: number, userId: number) {
+		return dispatch(addAssignee(cardId, userId));
+	};
+}
+
+export function useRemoveAssigneeAction() {
+	const dispatch = useAppDispatch();
+	return function (cardId: number, userId: number) {
+		return dispatch(removeAssignee(cardId, userId));
+	};
+}
+
+// --- LABELS -----
+export function useAddLabelAction() {
+	const dispatch = useAppDispatch();
+	return (taskId: string, labelId: string) =>
+		dispatch(addLabelToCard(taskId, labelId));
+}
+
+export function useRemoveLabelAction() {
+	const dispatch = useAppDispatch();
+	return (taskId: string, labelId: string) =>
+		dispatch(removeLabelFromCard(taskId, labelId));
+}
+
+//
+// ─── UI HOOKS ──────────────────────────────────────────────
+//
+export function useUiPending() {
+	return useAppSelector(getUiPending);
+}
+
+export function useUiError() {
+	return useAppSelector(getUiError);
+}
+
+export function useUiResetError() {
+	const dispatch = useAppDispatch();
+	return function () {
+		return dispatch(uiResetError());
+	};
+}
diff --git a/client/src/store/boards/reducer.test.ts b/client/src/store/boards/reducer.test.ts
index 6cfbc19..a349106 100644
--- a/client/src/store/boards/reducer.test.ts
+++ b/client/src/store/boards/reducer.test.ts
@@ -50,6 +50,7 @@ describe("boardsReducer", () => {
 			lists: [],
 			members: [],
 			image: "image.jpg",
+			boardLabels: [],
 		};
 		const initialState = {
 			...boardsDefaultstateBoards,
@@ -97,6 +98,7 @@ describe("boardsReducer", () => {
 					title: "board 1",
 					lists: [],
 					members: [],
+					boardLabel: [],
 					image: "image.jpg",
 				},
 			],
@@ -130,6 +132,7 @@ describe("boardsReducer", () => {
 			title: "board 1",
 			lists: [],
 			members: [],
+			boardLabels: [],
 			image: "image.jpg",
 		};
 		const result = boardsReducer(boardsDefaultstateBoards, {
@@ -165,6 +168,7 @@ describe("boardsReducer", () => {
 			title: "board 1",
 			lists: [],
 			members: [],
+			boardLabels: [],
 			image: "image.jpg",
 		};
 		const result = boardsReducer(boardsDefaultstateBoards, {
@@ -221,6 +225,7 @@ describe("boardsReducer", () => {
 					title: "Board 1",
 					lists: [],
 					members: [],
+					boardLabels: [],
 					image: "img1.jpg",
 				},
 				{
@@ -229,6 +234,7 @@ describe("boardsReducer", () => {
 					title: "Board 2",
 					lists: [],
 					members: [],
+					boardLabels: [],
 					image: "img2.jpg",
 				},
 			],
@@ -244,6 +250,7 @@ describe("boardsReducer", () => {
 					title: "Updated Board",
 					lists: [],
 					members: [],
+					boardLabels: [],
 					image: "updated.jpg",
 				},
 			},
@@ -295,6 +302,7 @@ describe("boardsReducer", () => {
 			title: "Board 1",
 			lists: [],
 			members: [],
+			boardLabels: [],
 			image: "img1.jpg",
 		},
 		loading: false,
@@ -312,7 +320,7 @@ describe("boardsReducer", () => {
 			cards: [],
 			position: 1,
 		};
-		const initialCurrentBoard = boardsDefaultstateColumns.currentBoard!;
+		const initialCurrentBoard = boardsDefaultstateColumns.currentBoard;
 		const result = boardsReducer(boardsDefaultstateColumns, {
 			type: "boards/addColumn/fulfilled",
 			payload: columnPayload,
@@ -429,6 +437,7 @@ describe("boardsReducer", () => {
 				slug: "board-1",
 				title: "Board 1",
 				members: [],
+				boardLabels: [],
 				image: "img1.jpg",
 				lists: [
 					{
@@ -486,6 +495,7 @@ describe("boardsReducer", () => {
 				title: "Board 1",
 				lists: [],
 				members: [],
+				boardLabels: [],
 				image: "img1.jpg",
 			},
 			{
@@ -763,6 +773,7 @@ describe("boardsReducer", () => {
 			title: "Board 1",
 			image: "img1.jpg",
 			members: [],
+			boardLabels: [],
 			lists: [
 				{
 					id: "1",
diff --git a/client/src/store/boards/reducer.ts b/client/src/store/boards/reducer.ts
index 5808bcd..adaf9dd 100644
--- a/client/src/store/boards/reducer.ts
+++ b/client/src/store/boards/reducer.ts
@@ -237,6 +237,87 @@ export function boardsReducer(
 					})),
 				},
 			};
+		case "tasks/addLabelToCard/fulfilled": {
+			if (!state.currentBoard) return state;
+
+			const labelToAdd = state.currentBoard.labels.find(
+				(l) => l.id.toString() === action.payload.labelId.toString(),
+			);
+			if (!labelToAdd) return state;
+
+			return {
+				...state,
+				currentBoard: {
+					...state.currentBoard,
+					lists: state.currentBoard.lists.map((col) => ({
+						...col,
+						cards: col.cards.map((task) => {
+							if (task.id?.toString() !== action.payload.taskId.toString()) {
+								return task;
+							}
+
+							const alreadyHasLabel = task.labels?.some(
+								(l) => l.label.id === labelToAdd.id,
+							);
+
+							if (alreadyHasLabel) return task;
+
+							const newLabelRelation = {
+								cardId: task.id,
+								labelId: labelToAdd.id,
+								label: labelToAdd,
+							};
+
+							return {
+								...task,
+								labels: [...(task.labels ?? []), newLabelRelation],
+							};
+						}),
+					})),
+				},
+			};
+		}
+
+		case "tasks/addLabel/fulfilled":
+			if (!state.currentBoard) return state;
+			if (
+				state.currentBoard.labels.some(
+					(label) => label.id === action.payload.label.id,
+				)
+			) {
+				return state;
+			}
+			return {
+				...state,
+				currentBoard: {
+					...state.currentBoard,
+					labels: [...state.currentBoard.labels, action.payload.label],
+				},
+			};
+
+		case "tasks/removeLabelFromCard/fulfilled":
+			if (!state.currentBoard) return state;
+			return {
+				...state,
+				currentBoard: {
+					...state.currentBoard,
+					lists: state.currentBoard.lists.map((col) => ({
+						...col,
+						cards: col.cards.map((task) =>
+							task.id?.toString() === action.payload.taskId
+								? {
+										...task,
+										labels: task.labels?.filter(
+											(label) =>
+												label.label.id.toString() !==
+												action.payload.labelId.toString(),
+										),
+									}
+								: task,
+						),
+					})),
+				},
+			};
 
 		default:
 			return state;
diff --git a/client/src/utils/endpoints.ts b/client/src/utils/endpoints.ts
index 0bd29de..cdd0919 100644
--- a/client/src/utils/endpoints.ts
+++ b/client/src/utils/endpoints.ts
@@ -46,3 +46,12 @@ export const getAccountEndpoint = (typeAccount: TypeAccount): string | null => {
 	}
 	return `${USER_ENDPOINTS.PROFILE}?account=${typeAccount}`;
 };
+
+export const LABEL_ENDPOINTS = {
+	BY_BOARD: (boardId: string | number) =>
+		`/api/${VERSION}/boards/${boardId}/labels`,
+	BY_CARD: (cardId: string | number, labelId?: string | number) =>
+		labelId
+			? `/api/${VERSION}/cards/${cardId}/labels/${labelId}`
+			: `/api/${VERSION}/cards/${cardId}/labels`,
+};
diff --git a/server/src/controllers/boardController.ts b/server/src/controllers/boardController.ts
index e619e9c..52d42a4 100644
--- a/server/src/controllers/boardController.ts
+++ b/server/src/controllers/boardController.ts
@@ -1,267 +1,297 @@
-import { Request, Response } from "express";
-import BoardService from "../services/BoardService";
-import { Prisma } from "@prisma/client";
-import { BoardWithRelations } from "../models/BoardModel";
-import jwt from "jsonwebtoken";
-import AuthService from "../services/AuthService";
-import { slugify } from "../utils/utils";
-import { deleteImage } from "../utils/fileUtils";
-
-import dotenv from "dotenv";
-
-dotenv.config();
-
-interface InvitationJwtPayload {
-  boardId: string;
-  inviterId: number;
-  email: string;
-  type: "board-invitation";
-}
-
-interface AcceptInvitationPayload {
-  token: string;
-  userId: number;
-}
-
-export class BoardController {
-  private readonly boardService: BoardService;
-  private readonly authService: AuthService;
-
-  constructor(boardService: BoardService, authService: AuthService) {
-    this.boardService = boardService;
-    this.authService = authService;
-  }
-
-  getAll = async (req: Request, res: Response) => {
-    try {
-      const userId = req.apiUserId;
-      const limit = Math.max(parseInt(req.query.limit as string) || 10, 1);
-      const page = Math.max(parseInt(req.query.page as string) || 1, 1);
-      const skip = (page - 1) * limit;
-      const withCount = req.query.withCount === "true";
-
-      if (withCount) {
-        const [boards, totalCount]: [BoardWithRelations[], number] =
-          await Promise.all([
-            this.boardService.getAllBoardsByUserId(userId, limit, skip),
-            this.boardService.getBoardCountByUserId(userId),
-          ]);
-        return res.json({
-          boards,
-          pagination: {
-            limit,
-            page,
-            totalPages: Math.ceil(totalCount / limit),
-            hasNextPage: page < Math.ceil(totalCount / limit),
-            hasPrevPage: page > 1,
-          },
-        });
-      }
-
-      const boards: BoardWithRelations[] =
-        await this.boardService.getAllBoardsByUserId(userId, limit, skip);
-
-      res.json(boards);
-    } catch (err) {
-      res.status(500).send("Error al obtener los tableros");
-    }
-  };
-
-  get = async (req: Request, res: Response) => {
-    try {
-      const userId = req.apiUserId;
-      const boardSlug = req.params.slug;
-      const board = await this.boardService.get({ userId, boardSlug });
-      if (!board) {
-        return res.status(404).send({
-          message: "Tablero no encontrado o acceso denegado.",
-          status: 404,
-        });
-      }
-      res.json(board);
-    } catch (err) {
-      res.status(500).send("Error al obtener el tablero");
-    }
-  };
-
-  getBoardByTitle = async (req: Request, res: Response) => {
-    try {
-      const userId = req.apiUserId;
-      const boardTitle = String(req.query.title) || "";
-      const boards = await this.boardService.getBoardByTitle(
-        userId,
-        boardTitle,
-      );
-      res.json(boards);
-    } catch (error) {
-      res.status(404).send("No existen tableros con este nombre");
-    }
-  };
-
-  getBoardByMember = async (req: Request, res: Response) => {
-    try {
-      const userId = req.apiUserId;
-      const boardMember = String(req.query.member) || "";
-      const boards = await this.boardService.getBoardByMember(
-        userId,
-        boardMember,
-      );
-      res.json(boards);
-    } catch (error) {
-      res.status(404).send("No hay tableros con este miembro");
-    }
-  };
-
-  add = async (req: Request, res: Response) => {
-    try {
-      const userId = req.apiUserId;
-      const { title }: { title: string } = req.body;
-      const slug = slugify(title);
-
-      const image: string | undefined = req.body.image
-        ? `/uploads/boards/${req.body.image}`
-        : undefined;
-
-      const board = await this.boardService.add({ userId, title, image, slug });
-      res.status(201).json(board);
-    } catch (err) {
-      if (err instanceof Error) {
-        res.status(500).send("Error al crear el tablero");
-      }
-    }
-  };
-
-  update = async (req: Request, res: Response) => {
-    try {
-      const userId = req.apiUserId;
-      const boardId = Number(req.params.id);
-      const { title, image }: { title?: string; image?: string } = req.body;
-      const currentBoard = await this.boardService.getById({ userId, boardId });
-
-      const data: Prisma.BoardUpdateInput = {};
-
-      if (title) {
-        data.title = title;
-      }
-
-      if (image) {
-        data.image = `/uploads/boards/${image}`;
-      }
-
-      const updatedBoard = await this.boardService.update({
-        userId,
-        boardId,
-        data,
-      });
-
-      if (currentBoard?.image) {
-        const imageName = currentBoard.image.replace(".webp", "");
-        const originalToDelete = `/uploads/boards/${imageName}_o.webp`;
-        const thumbnailToDelete = `/uploads/boards/${imageName}_t.webp`;
-        deleteImage({
-          originalImagePath: originalToDelete,
-          thumbnailImagePath: thumbnailToDelete,
-        });
-      }
-
-      res.status(200).json(updatedBoard);
-    } catch (err) {
-      res.status(500).send("Error al actualizar el tablero");
-    }
-  };
-
-  delete = async (req: Request, res: Response) => {
-    try {
-      const userId = req.apiUserId;
-      const boardId = parseInt(req.params.id);
-      const currentBoard = await this.boardService.getById({ userId, boardId });
-
-      await this.boardService.delete({ userId, boardId });
-
-      if (currentBoard?.image) {
-        const imageName = currentBoard.image.replace(".webp", "");
-        const originalToDelete = `/uploads/boards/${imageName}_o.webp`;
-        const thumbnailToDelete = `/uploads/boards/${imageName}_t.webp`;
-        deleteImage({
-          originalImagePath: originalToDelete,
-          thumbnailImagePath: thumbnailToDelete,
-        });
-      }
-
-      res.status(204).json({});
-    } catch (err) {
-      res.status(500).send("Error al eliminar el tablero");
-    }
-  };
-
-  shareBoard = async (req: Request, res: Response) => {
-    const JWT_SECRET = process.env.JWT_SECRET;
-    if (!JWT_SECRET) {
-      throw new Error("JWT_SECRET is not defined in environment variables");
-    }
-
-    try {
-      const userId = req.apiUserId;
-      const boardId = Number(req.params.id);
-      const board = await this.boardService.getById({ userId, boardId });
-      const inviter = await this.authService.findById(userId);
-      const payload = {
-        boardId: boardId,
-        inviterId: userId,
-        type: "board-invitation",
-      };
-
-      const token = jwt.sign(payload, JWT_SECRET, { expiresIn: "24h" });
-
-      res.status(201).json({
-        token,
-        inviterName: inviter?.name,
-        boardTitle: board?.title,
-        inviterPhoto: inviter?.photo,
-        boardId,
-        slug: board?.slug,
-      });
-    } catch (err) {
-      console.error("Error generating invitation link:", err);
-      res.status(500).send("Error al generar el enlace de invitación");
-    }
-  };
-
-  acceptInvitation = async (req: Request, res: Response) => {
-    const JWT_SECRET = process.env.JWT_SECRET;
-    if (!JWT_SECRET) {
-      throw new Error("JWT_SECRET no está en las variables de entorno");
-    }
-
-    try {
-      const { token } = req.body as { token: string };
-      const userId = req.apiUserId;
-
-      const payload = jwt.verify(token, JWT_SECRET) as InvitationJwtPayload;
-      const { boardId } = payload;
-      await this.boardService.acceptInvitation({
-        boardId: Number(boardId),
-        userId,
-      });
-      res.status(200).send(`¡Invitación aceptada para el tablero ${boardId}!`);
-    } catch (err) {
-      console.error(err);
-      if (err instanceof jwt.JsonWebTokenError) {
-        return res.status(401).send("Enlace de invitación inválido o expirado");
-      }
-      res.status(500).send("Error al aceptar la invitación");
-    }
-  };
-
-  boardUsers = async (req: Request, res: Response) => {
-    try {
-      const userId = req.apiUserId;
-      const boardId = req.params.id;
-      const board = await this.boardService.getBoardUsers({ userId, boardId });
-      res.json(board);
-    } catch (err) {
-      console.log("error", err);
-      res.status(500).send("Error al obtener usuarios del tablero");
-    }
-  };
-}
+import { NextFunction, Request, Response } from "express";
+import BoardService from "../services/BoardService";
+import { Prisma } from "@prisma/client";
+import { BoardWithRelations } from "../models/BoardModel";
+import jwt from "jsonwebtoken";
+import AuthService from "../services/AuthService";
+import { slugify } from "../utils/utils";
+import { deleteImage } from "../utils/fileUtils";
+
+import dotenv from "dotenv";
+
+dotenv.config();
+
+interface InvitationJwtPayload {
+  boardId: string;
+  inviterId: number;
+  email: string;
+  type: "board-invitation";
+}
+
+interface AcceptInvitationPayload {
+  token: string;
+  userId: number;
+}
+
+export class BoardController {
+  private readonly boardService: BoardService;
+  private readonly authService: AuthService;
+
+  constructor(boardService: BoardService, authService: AuthService) {
+    this.boardService = boardService;
+    this.authService = authService;
+  }
+
+  getAll = async (req: Request, res: Response) => {
+    try {
+      const userId = req.apiUserId;
+      const limit = Math.max(parseInt(req.query.limit as string) || 10, 1);
+      const page = Math.max(parseInt(req.query.page as string) || 1, 1);
+      const skip = (page - 1) * limit;
+      const withCount = req.query.withCount === "true";
+
+      if (withCount) {
+        const [boards, totalCount]: [BoardWithRelations[], number] =
+          await Promise.all([
+            this.boardService.getAllBoardsByUserId(userId, limit, skip),
+            this.boardService.getBoardCountByUserId(userId),
+          ]);
+        return res.json({
+          boards,
+          pagination: {
+            limit,
+            page,
+            totalPages: Math.ceil(totalCount / limit),
+            hasNextPage: page < Math.ceil(totalCount / limit),
+            hasPrevPage: page > 1,
+          },
+        });
+      }
+
+      const boards: BoardWithRelations[] =
+        await this.boardService.getAllBoardsByUserId(userId, limit, skip);
+
+      res.json(boards);
+    } catch (err) {
+      res.status(500).send("Error al obtener los tableros");
+    }
+  };
+
+  get = async (req: Request, res: Response) => {
+    try {
+      const userId = req.apiUserId;
+      const boardSlug = req.params.slug;
+      const board = await this.boardService.get({ userId, boardSlug });
+      if (!board) {
+        return res.status(404).send({
+          message: "Tablero no encontrado o acceso denegado.",
+          status: 404,
+        });
+      }
+      res.json(board);
+    } catch (err) {
+      res.status(500).send("Error al obtener el tablero");
+    }
+  };
+
+  getBoardByTitle = async (req: Request, res: Response) => {
+    try {
+      const userId = req.apiUserId;
+      const boardTitle = String(req.query.title) || "";
+      const boards = await this.boardService.getBoardByTitle(
+        userId,
+        boardTitle,
+      );
+      res.json(boards);
+    } catch (error) {
+      res.status(404).send("No existen tableros con este nombre");
+    }
+  };
+
+  getBoardByMember = async (req: Request, res: Response) => {
+    try {
+      const userId = req.apiUserId;
+      const boardMember = String(req.query.member) || "";
+      const boards = await this.boardService.getBoardByMember(
+        userId,
+        boardMember,
+      );
+      res.json(boards);
+    } catch (error) {
+      res.status(404).send("No hay tableros con este miembro");
+    }
+  };
+
+  add = async (req: Request, res: Response) => {
+    try {
+      const userId = req.apiUserId;
+      const { title }: { title: string } = req.body;
+      const slug = slugify(title);
+
+      const image: string | undefined = req.body.image
+        ? `/uploads/boards/${req.body.image}`
+        : undefined;
+
+      const board = await this.boardService.add({ userId, title, image, slug });
+      res.status(201).json(board);
+    } catch (err) {
+      if (err instanceof Error) {
+        res.status(500).send("Error al crear el tablero");
+      }
+    }
+  };
+
+  update = async (req: Request, res: Response) => {
+    try {
+      const userId = req.apiUserId;
+      const boardId = Number(req.params.id);
+      const { title, image }: { title?: string; image?: string } = req.body;
+      const currentBoard = await this.boardService.getById({ userId, boardId });
+
+      const data: Prisma.BoardUpdateInput = {};
+
+      if (title) {
+        data.title = title;
+      }
+
+      if (image) {
+        data.image = `/uploads/boards/${image}`;
+      }
+
+      const updatedBoard = await this.boardService.update({
+        userId,
+        boardId,
+        data,
+      });
+
+      if (currentBoard?.image) {
+        const imageName = currentBoard.image.replace(".webp", "");
+        const originalToDelete = `/uploads/boards/${imageName}_o.webp`;
+        const thumbnailToDelete = `/uploads/boards/${imageName}_t.webp`;
+        deleteImage({
+          originalImagePath: originalToDelete,
+          thumbnailImagePath: thumbnailToDelete,
+        });
+      }
+
+      res.status(200).json(updatedBoard);
+    } catch (err) {
+      res.status(500).send("Error al actualizar el tablero");
+    }
+  };
+
+  delete = async (req: Request, res: Response) => {
+    try {
+      const userId = req.apiUserId;
+      const boardId = parseInt(req.params.id);
+      const currentBoard = await this.boardService.getById({ userId, boardId });
+
+      await this.boardService.delete({ userId, boardId });
+
+      if (currentBoard?.image) {
+        const imageName = currentBoard.image.replace(".webp", "");
+        const originalToDelete = `/uploads/boards/${imageName}_o.webp`;
+        const thumbnailToDelete = `/uploads/boards/${imageName}_t.webp`;
+        deleteImage({
+          originalImagePath: originalToDelete,
+          thumbnailImagePath: thumbnailToDelete,
+        });
+      }
+
+      res.status(204).json({});
+    } catch (err) {
+      res.status(500).send("Error al eliminar el tablero");
+    }
+  };
+
+  shareBoard = async (req: Request, res: Response) => {
+    const JWT_SECRET = process.env.JWT_SECRET;
+    if (!JWT_SECRET) {
+      throw new Error("JWT_SECRET is not defined in environment variables");
+    }
+
+    try {
+      const userId = req.apiUserId;
+      const boardId = Number(req.params.id);
+      const board = await this.boardService.getById({ userId, boardId });
+      const inviter = await this.authService.findById(userId);
+      const payload = {
+        boardId: boardId,
+        inviterId: userId,
+        type: "board-invitation",
+      };
+
+      const token = jwt.sign(payload, JWT_SECRET, { expiresIn: "24h" });
+
+      res.status(201).json({
+        token,
+        inviterName: inviter?.name,
+        boardTitle: board?.title,
+        inviterPhoto: inviter?.photo,
+        boardId,
+        slug: board?.slug,
+      });
+    } catch (err) {
+      console.error("Error generating invitation link:", err);
+      res.status(500).send("Error al generar el enlace de invitación");
+    }
+  };
+
+  acceptInvitation = async (req: Request, res: Response) => {
+    const JWT_SECRET = process.env.JWT_SECRET;
+    if (!JWT_SECRET) {
+      throw new Error("JWT_SECRET no está en las variables de entorno");
+    }
+
+    try {
+      const { token } = req.body as { token: string };
+      const userId = req.apiUserId;
+
+      const payload = jwt.verify(token, JWT_SECRET) as InvitationJwtPayload;
+      const { boardId } = payload;
+      await this.boardService.acceptInvitation({
+        boardId: Number(boardId),
+        userId,
+      });
+      res.status(200).send(`¡Invitación aceptada para el tablero ${boardId}!`);
+    } catch (err) {
+      console.error(err);
+      if (err instanceof jwt.JsonWebTokenError) {
+        return res.status(401).send("Enlace de invitación inválido o expirado");
+      }
+      res.status(500).send("Error al aceptar la invitación");
+    }
+  };
+
+  boardUsers = async (req: Request, res: Response) => {
+    try {
+      const userId = req.apiUserId;
+      const boardId = req.params.id;
+      const board = await this.boardService.getBoardUsers({ userId, boardId });
+      res.json(board);
+    } catch (err) {
+      console.log("error", err);
+      res.status(500).send("Error al obtener usuarios del tablero");
+    }
+  };
+
+  getBoardLabels = async (req: Request, res: Response, next: NextFunction) => {
+    try {
+      const userId = req.apiUserId;
+      const { boardId } = req.params;
+
+      const labels = await this.boardService.getLabels(userId, Number(boardId));
+      res.json(labels);
+    } catch (err) {
+      next(err);
+    }
+  };
+
+  createLabel = async (req: Request, res: Response, next: NextFunction) => {
+    try {
+      const userId = req.apiUserId;
+      const { boardId } = req.params;
+      const { name, color } = req.body;
+
+      const label = await this.boardService.createLabel(
+        userId,
+        Number(boardId),
+        name,
+        color,
+      );
+      res.status(201).json(label);
+    } catch (err) {
+      next(err);
+    }
+  };
+}
diff --git a/server/src/controllers/cardController.ts b/server/src/controllers/cardController.ts
index 2922ad2..5c307df 100644
--- a/server/src/controllers/cardController.ts
+++ b/server/src/controllers/cardController.ts
@@ -195,4 +195,41 @@ export class CardController {
       );
     }
   };
+
+  addLabelToCard = async (req: Request, res: Response, next: NextFunction) => {
+    try {
+      const userId = req.apiUserId;
+      const { cardId, labelId } = req.params;
+
+      const updatedCard = await this.cardService.addLabelToCard(
+        userId,
+        Number(cardId),
+        Number(labelId),
+      );
+
+      res.status(200).json(updatedCard);
+    } catch (err) {
+      next(err);
+    }
+  };
+
+  removeLabelFromCard = async (
+    req: Request,
+    res: Response,
+    next: NextFunction,
+  ) => {
+    try {
+      const userId = req.apiUserId;
+      const { cardId, labelId } = req.params;
+
+      await this.cardService.removeLabelFromCard(
+        userId,
+        Number(cardId),
+        Number(labelId),
+      );
+      res.status(204).send();
+    } catch (err) {
+      next(err);
+    }
+  };
 }
diff --git a/server/src/models/BoardModel.ts b/server/src/models/BoardModel.ts
index e186468..05d1b00 100644
--- a/server/src/models/BoardModel.ts
+++ b/server/src/models/BoardModel.ts
@@ -25,6 +25,11 @@ const boardWithRelationsData = Prisma.validator<Prisma.BoardFindManyArgs>()({
               },
             },
             media: true,
+            labels: {
+              include: {
+                label: true,
+              },
+            },
           },
         },
       },
@@ -300,6 +305,18 @@ class BoardModel {
 
     return members.map((m) => m.user);
   }
+
+  async getLabels(boardId: number) {
+    return this.prisma.label.findMany({
+      where: { boardId },
+    });
+  }
+
+  async createLabel(boardId: number, name: string, color: string) {
+    return this.prisma.label.create({
+      data: { boardId, name, color },
+    });
+  }
 }
 
 export default BoardModel;
diff --git a/server/src/models/CardModel.ts b/server/src/models/CardModel.ts
index 19e106f..4a9888e 100644
--- a/server/src/models/CardModel.ts
+++ b/server/src/models/CardModel.ts
@@ -28,6 +28,11 @@ export default class CardModel {
       where: { listId },
       include: {
         media: true,
+        labels: {
+          include: {
+            label: true,
+          },
+        },
       },
     });
   }
@@ -40,6 +45,11 @@ export default class CardModel {
           select: { boardId: true },
         },
         media: true,
+        labels: {
+          include: {
+            label: true,
+          },
+        },
       },
     });
 
@@ -150,4 +160,16 @@ export default class CardModel {
       },
     });
   }
+
+  async addLabelToCard(cardId: number, labelId: number) {
+    return this.prisma.cardLabel.create({
+      data: { cardId, labelId },
+    });
+  }
+
+  async removeLabelFromCard(cardId: number, labelId: number) {
+    return this.prisma.cardLabel.delete({
+      where: { cardId_labelId: { cardId, labelId } },
+    });
+  }
 }
diff --git a/server/src/routes/boards.routes.ts b/server/src/routes/boards.routes.ts
index ad2b28f..b46cfe7 100644
--- a/server/src/routes/boards.routes.ts
+++ b/server/src/routes/boards.routes.ts
@@ -7,12 +7,14 @@ import * as jwtAuth from "../middlewares/jwtAuthMiddleware";
 import AuthService from "../services/AuthService";
 import AuthModel from "../models/AuthModel";
 import { processImage, upload } from "../lib/uploadConfigure";
+import CardModel from "../models/CardModel";
 
 const router = Router();
 
 // Inyección de dependencias
 const model = new BoardModel(prisma);
-const service = new BoardService(model);
+const cardModel = new CardModel(prisma);
+const service = new BoardService(model, cardModel);
 const authModel = new AuthModel(prisma);
 const authService = new AuthService(authModel);
 const controller = new BoardController(service, authService);
@@ -48,4 +50,7 @@ router.post("/:id/invite", jwtAuth.guard, controller.acceptInvitation);
 
 router.get("/:id/users", jwtAuth.guard, controller.boardUsers);
 
+router.get("/:boardId/labels", jwtAuth.guard, controller.getBoardLabels);
+router.post("/:boardId/labels", jwtAuth.guard, controller.createLabel);
+
 export default router;
diff --git a/server/src/routes/card.routes.ts b/server/src/routes/card.routes.ts
index c27169d..3667519 100644
--- a/server/src/routes/card.routes.ts
+++ b/server/src/routes/card.routes.ts
@@ -38,4 +38,15 @@ router.delete(
   controller.removeAssignee,
 );
 
+router.post(
+  "/:cardId/labels/:labelId",
+  jwtAuth.guard,
+  controller.addLabelToCard,
+);
+router.delete(
+  "/:cardId/labels/:labelId",
+  jwtAuth.guard,
+  controller.removeLabelFromCard,
+);
+
 export default router;
diff --git a/server/src/services/BoardService.ts b/server/src/services/BoardService.ts
index c2c061f..6064457 100644
--- a/server/src/services/BoardService.ts
+++ b/server/src/services/BoardService.ts
@@ -1,11 +1,14 @@
 import { Board, Prisma } from "@prisma/client";
 import BoardModel, { BoardWithRelations, SafeUser } from "../models/BoardModel";
+import CardModel from "../models/CardModel";
 
 class BoardService {
   private readonly boardModel: BoardModel;
+  private readonly cardModal: CardModel;
 
-  constructor(boardModel: BoardModel) {
+  constructor(boardModel: BoardModel, cardModel: CardModel) {
     this.boardModel = boardModel;
+    this.cardModal = cardModel;
   }
   async getAllBoardsByUserId(
     userId: number,
@@ -112,6 +115,27 @@ class BoardService {
   }): Promise<SafeUser[]> {
     return this.boardModel.getBoardUsers(data);
   }
+
+  async getLabels(userId: number, boardId: number) {
+    const isMember = await this.cardModal._isUserBoardMember(userId, boardId);
+    if (!isMember) {
+      throw new Error("No tienes permiso para ver etiquetas de este board");
+    }
+    return this.boardModel.getLabels(boardId);
+  }
+
+  async createLabel(
+    userId: number,
+    boardId: number,
+    name: string,
+    color: string,
+  ) {
+    const isMember = await this.cardModal._isUserBoardMember(userId, boardId);
+    if (!isMember) {
+      throw new Error("No tienes permiso para crear etiquetas en este board");
+    }
+    return this.boardModel.createLabel(boardId, name, color);
+  }
 }
 
 export default BoardService;
diff --git a/server/src/services/CardService.ts b/server/src/services/CardService.ts
index dd07297..6e1358d 100644
--- a/server/src/services/CardService.ts
+++ b/server/src/services/CardService.ts
@@ -111,4 +111,24 @@ export default class CardService {
     }
     return this.cardModel.removeAssignee(cardId, assigneeId);
   }
+
+  async addLabelToCard(userId: number, cardId: number, labelId: number) {
+    const isMember = await this.cardModel.isUserBoardMember(userId, cardId);
+    if (!isMember) {
+      throw new Error(
+        "No tienes permiso para asignar etiquetas en esta tarjeta",
+      );
+    }
+    return this.cardModel.addLabelToCard(cardId, labelId);
+  }
+
+  async removeLabelFromCard(userId: number, cardId: number, labelId: number) {
+    const isMember = await this.cardModel.isUserBoardMember(userId, cardId);
+    if (!isMember) {
+      throw new Error(
+        "No tienes permiso para eliminar etiquetas en esta tarjeta",
+      );
+    }
+    return this.cardModel.removeLabelFromCard(cardId, labelId);
+  }
 }
diff --git a/server/src/sockets/handlers/user.ts b/server/src/sockets/handlers/user.ts
index d762868..0d9f01b 100644
--- a/server/src/sockets/handlers/user.ts
+++ b/server/src/sockets/handlers/user.ts
@@ -2,10 +2,14 @@ import { BoardUser, ServerUser, SocketUser } from "../types";
 import BoardService from "../../services/BoardService";
 import BoardModel from "../../models/BoardModel";
 import prisma from "../../config/db";
+import CardModel from "../../models/CardModel";
 
 export default class UserHandler {
   private readonly connectedUsers: Map<string, BoardUser> = new Map();
-  private readonly boardService = new BoardService(new BoardModel(prisma));
+  private readonly boardService = new BoardService(
+    new BoardModel(prisma),
+    new CardModel(prisma),
+  );
   constructor(private readonly io: ServerUser) {}
 
   initialize(socket: SocketUser) {
diff --git a/server/tests/unit/BoardService.test.ts b/server/tests/unit/BoardService.test.ts
index 84edb33..ac78db9 100644
--- a/server/tests/unit/BoardService.test.ts
+++ b/server/tests/unit/BoardService.test.ts
@@ -1,4 +1,5 @@
 import BoardModel from "../../src/models/BoardModel";
+import CardModel from "../../src/models/CardModel";
 import BoardService from "../../src/services/BoardService";
 
 const mockBoardModel = {
@@ -16,11 +17,13 @@ const mockBoardModel = {
   getBoardUsers: jest.fn(),
 } as unknown as BoardModel;
 
+const mockCardModel = {} as unknown as CardModel;
+
 let boardService: BoardService;
 
 beforeEach(() => {
   jest.clearAllMocks();
-  boardService = new BoardService(mockBoardModel);
+  boardService = new BoardService(mockBoardModel, mockCardModel);
 });
 
 describe("BoardService - happy path", () => {