diff --git a/app/Http/Controllers/Projects/ActivityController.php b/app/Http/Controllers/Projects/ActivityController.php
index 1317984..8996fc6 100644
--- a/app/Http/Controllers/Projects/ActivityController.php
+++ b/app/Http/Controllers/Projects/ActivityController.php
@@ -22,6 +22,11 @@ class ActivityController extends Controller
             $query->where('object_type', 'jobs');
         });
 
+        $activityQuery->orWhere(function ($query) use ($project) {
+            $query->whereIn('object_id', $project->tasks->pluck('id'));
+            $query->where('object_type', 'tasks');
+        });
+
         $activities = $activityQuery->latest()->paginate(50);
 
         return view('projects.activities.index', compact('project', 'activities'));
diff --git a/resources/lang/de/activity.php b/resources/lang/de/activity.php
index 645cbcd..6d4ab47 100644
--- a/resources/lang/de/activity.php
+++ b/resources/lang/de/activity.php
@@ -11,4 +11,8 @@ return [
         'job_updated'  => 'Job data <strong>:name</strong> updated by <strong>:user</strong>.',
         'task_deleted' => 'Task deleted by <strong>:user</strong>.',
     ],
+    'tasks'    => [
+        'task_created' => 'Task created: <strong>:name</strong> new <strong>:user</strong>.',
+        'task_updated' => 'Task data <strong>:name</strong> updated by <strong>:user</strong>.',
+    ],
 ];
diff --git a/resources/lang/de/job.php b/resources/lang/de/job.php
index 1de5f16..a331a2b 100644
--- a/resources/lang/de/job.php
+++ b/resources/lang/de/job.php
@@ -48,6 +48,7 @@ return [
     'actual_start_date' => 'Actual Start Date',
     'actual_end_date'   => 'Actual End Date',
     'updated_at'        => 'Last Update',
+    'position'          => 'Priority',
 
     // Types
     'main'       => 'Haupt',
diff --git a/resources/lang/en/activity.php b/resources/lang/en/activity.php
index 645cbcd..6d4ab47 100644
--- a/resources/lang/en/activity.php
+++ b/resources/lang/en/activity.php
@@ -11,4 +11,8 @@ return [
         'job_updated'  => 'Job data <strong>:name</strong> updated by <strong>:user</strong>.',
         'task_deleted' => 'Task deleted by <strong>:user</strong>.',
     ],
+    'tasks'    => [
+        'task_created' => 'Task created: <strong>:name</strong> new <strong>:user</strong>.',
+        'task_updated' => 'Task data <strong>:name</strong> updated by <strong>:user</strong>.',
+    ],
 ];
diff --git a/resources/lang/en/job.php b/resources/lang/en/job.php
index df8c6ff..ce51fd6 100644
--- a/resources/lang/en/job.php
+++ b/resources/lang/en/job.php
@@ -50,6 +50,7 @@ return [
     'actual_start_date' => 'Actual Start Date',
     'actual_end_date'   => 'Actual End Date',
     'updated_at'        => 'Last Update',
+    'position'          => 'Priority',
 
     // Types
     'main'       => 'Main',
diff --git a/resources/lang/id/activity.php b/resources/lang/id/activity.php
index 8f996c9..aeff609 100644
--- a/resources/lang/id/activity.php
+++ b/resources/lang/id/activity.php
@@ -11,4 +11,8 @@ return [
         'job_updated'  => 'Data job <strong>:name</strong> diubah oleh <strong>:user</strong>.',
         'task_deleted' => 'Task dihapus oleh <strong>:user</strong>.',
     ],
+    'tasks'    => [
+        'task_created' => 'Input task baru: <strong>:name</strong> oleh <strong>:user</strong>.',
+        'task_updated' => 'Data task <strong>:name</strong> diubah oleh <strong>:user</strong>.',
+    ],
 ];
diff --git a/resources/lang/id/job.php b/resources/lang/id/job.php
index 053fb84..f6f9e2a 100644
--- a/resources/lang/id/job.php
+++ b/resources/lang/id/job.php
@@ -50,6 +50,7 @@ return [
     'actual_start_date' => 'Tgl Mulai Aktual',
     'actual_end_date'   => 'Tgl Selesai Aktual',
     'updated_at'        => 'Waktu Update',
+    'position'          => 'Prioritas',
 
     // Types
     'main'       => 'Utama',
diff --git a/resources/views/users/activities/tasks/task_created.blade.php b/resources/views/users/activities/tasks/task_created.blade.php
new file mode 100644
index 0000000..421f0c6
--- /dev/null
+++ b/resources/views/users/activities/tasks/task_created.blade.php
@@ -0,0 +1,11 @@
+@component('users.activities.activity_list_item')
+@slot('time')
+    {{ $activity->created_at }}
+@endslot
+@slot('body')
+    {!! __('activity.'.$activity->object_type.'.'.$activity->type, [
+        'user' => $activity->user->name,
+        'name' => $activity->object->name,
+    ]) !!}
+@endslot
+@endcomponent
diff --git a/resources/views/users/activities/tasks/task_updated.blade.php b/resources/views/users/activities/tasks/task_updated.blade.php
new file mode 100644
index 0000000..63b03db
--- /dev/null
+++ b/resources/views/users/activities/tasks/task_updated.blade.php
@@ -0,0 +1,22 @@
+@component('users.activities.activity_list_item')
+@slot('time')
+    {{ $activity->created_at }}
+@endslot
+@slot('body')
+    <p>
+        {!! __('activity.'.$activity->object_type.'.'.$activity->type, [
+            'user' => $activity->user->name,
+            'name' => $activity->object->name,
+        ]) !!}
+    </p>
+    @php
+        $data = $activity->data;
+    @endphp
+    @foreach ($data['before'] as $key => $value)
+        @php
+            $afterValue = $data['after'][$key] ?? null;
+        @endphp
+        <div>{{ __('job.'.$key) }}: {{ $value }} => {{ $afterValue }}</div>
+    @endforeach
+@endslot
+@endcomponent