diff --git a/osinaweb/osinacore/add/views.py b/osinaweb/osinacore/add/views.py
index 567ff130..9a70545e 100644
--- a/osinaweb/osinacore/add/views.py
+++ b/osinaweb/osinacore/add/views.py
@@ -384,11 +384,13 @@ def add_task(request, project_id=None, requirement_id=None):
     requirement = None
     epics_of_my_project = None
     projects = None
+    milestones = None
 
     # Case where user wants to add task from project page(Adding a task for a project)
     if project_id:
         project = get_object_or_404(Project, project_id=project_id)
         epics_of_my_project = Epic.objects.filter(project=project)
+        milestones = Milestone.objects.filter(project=project).order_by('-id')
         if requirement_id:
             requirement = get_object_or_404(
                 UserStory, id=requirement_id)
@@ -414,6 +416,9 @@ def add_task(request, project_id=None, requirement_id=None):
         epic_id = request.POST.get('epic')
         epic = get_object_or_404(Epic, id=epic_id)
 
+        milestone_id = request.POST.get('milestone')
+        milestone = get_object_or_404(Milestone, id=milestone_id)
+
         assigned_to_id = request.POST.get('assigned_to')
         assigned_to = get_object_or_404(StaffProfile, id=assigned_to_id)
 
@@ -428,6 +433,7 @@ def add_task(request, project_id=None, requirement_id=None):
             end_date=end_date,
             assigned_to=assigned_to,
             userstory=requirement,
+            milestone=milestone,
 
         )
 
@@ -444,7 +450,8 @@ def add_task(request, project_id=None, requirement_id=None):
         'epics_of_my_project': epics_of_my_project,
         'staffs': staffs,
         'projects': projects,
-        'requirement': requirement
+        'requirement': requirement,
+        'milestones': milestones,
 
 
     }
diff --git a/osinaweb/osinacore/templates/add_templates/add-task.html b/osinaweb/osinacore/templates/add_templates/add-task.html
index 2332e887..f652fe9c 100644
--- a/osinaweb/osinacore/templates/add_templates/add-task.html
+++ b/osinaweb/osinacore/templates/add_templates/add-task.html
@@ -60,6 +60,17 @@
                 </select>
             </div>
 
+                    <div class="w-full">
+                <label class="text-gray-500">Milestone:</label>
+                <select required name="epic"
+                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
+                    <option value="" selected disabled>Select Milestone</option>
+                    {% for mile in milestones %}
+                    <option value="{{mile.id}}">{{mile.name}}</option>
+                    {% endfor %}
+                </select>
+            </div>
+
             <div class="w-full">
                 <label class="text-gray-500">Status:</label>
                 <select required name="status"