diff --git a/.env b/.env
index 15a7229..c0162bb 100644
--- a/.env
+++ b/.env
@@ -55,7 +55,6 @@ VITE_ENTITY_SYSTEM=entity-view-system
 VITE_BORHAN_SYSTEM=borhan-system
 VITE_THIQAT_SYSTEM=thiqat-system
 VITE_CHAT_SYSTEM=chat-system
-VITE_TASK_SYSTEM=task-system
 VITE_REPORT_SYSTEM=report-system
 VITE_ADMIN_SYSTEM=admin-panel
 VITE_TAHRIR_SYSTEM=tahrir-system
diff --git a/.env.majles b/.env.majles
index ab79b62..bb64b85 100644
--- a/.env.majles
+++ b/.env.majles
@@ -21,6 +21,7 @@ VITE_TAHRIR_PAGE_TITLE = قانون -  سامانه ای برای سندنگار
 VITE_REPORT_PAGE_TITLE = قانون - سامانه گزارش گیری داده
 VITE_PERMISSION_PAGE_TITLE = قانون - سامانه کنترل وظایف
 VITE_CHAT_PAGE_TITLE = قانون - سامانه گفتگو
+VITE_TASK_PAGE_TITLE = قانون - سامانه وظایف
 VITE_RESEARCH_PAGE_TITLE = قانون - تحقیقات من
 VITE_AI_TOOLS_PAGE_TITLE = قانون - حاشیه نویسی
 
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 4173a0b..32785c9 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -6,6 +6,7 @@ import chat from "./routes/chat";
 import haditha from "./routes/haditha";
 import search from "./routes/search";
 import research from "./routes/research";
+import task from "./routes/task";
 
 const envs = import.meta.env;
 let sassEnvVariables = "";
@@ -44,7 +45,7 @@ export default defineNuxtConfig({
 
     "pages:extend"(pages) {
       // Add custom routes
-      pages.push(...search, ...research, ...haditha, ...chat);
+      pages.push(...search, ...research, ...haditha, ...chat, ...task);
     },
   },
 
@@ -170,6 +171,7 @@ export default defineNuxtConfig({
     "@research": "~/systems/research_ui",
     "@haditha": "~/systems/hadith_ui",
     "@chat": "~/systems/chat_ui",
+    "@task": "~/systems/task_ui",
   },
   vite: {
     resolve: {},
diff --git a/routes/task.ts b/routes/task.ts
new file mode 100644
index 0000000..4ec79da
--- /dev/null
+++ b/routes/task.ts
@@ -0,0 +1,53 @@
+export default [
+  {
+    path: "/task",
+    file: "@task/pages/index.vue",
+    meta: { breadcrumb: "سامانه وظایف" },
+    children: [
+      {
+        path: "",
+        redirect: { name: "taskDashboard" },
+      },
+      {
+        path: "dashboard",
+        name: "taskDashboard",
+        file: "@task/pages/TaskDashboard.vue",
+        meta: {
+          breadcrumb: "پیشخوان مدیریت وظایف",
+        },
+      },
+      {
+        path: "times/list",
+        name: "taskTimes",
+        file: "@task/pages/Task.vue",
+        meta: {
+          breadcrumb: "ساعات",
+        },
+      },
+      {
+        path: "tasks/list",
+        name: "taskList",
+        file: "@task/pages/Task.vue",
+        meta: {
+          breadcrumb: "وظایف",
+        },
+      },
+      {
+        path: "teams/list",
+        name: "teams",
+        file: "@task/pages/TaskTeams.vue",
+        meta: {
+          breadcrumb: "تیم ها",
+        },
+      },
+      {
+        path: "admin/list",
+        name: "taskReport",
+        file: "@task/pages/TaskReport.vue",
+        meta: {
+          breadcrumb: "گزارش وظایف",
+        },
+      },
+    ],
+  },
+];
diff --git a/systems/task_ui b/systems/task_ui
index 0e61ff5..ad47094 160000
--- a/systems/task_ui
+++ b/systems/task_ui
@@ -1 +1 @@
-Subproject commit 0e61ff5f8d1e301cf6436a390f6412d2b0117d21
+Subproject commit ad470940f4cf986638b575d4b8afaa2ec50c267c