diff --git a/main.py b/main.py
index 1542db0a8f5c8963e028a7f6c9c883b631945f38..1a7bef988c17fdd5f17120c2a27411fee3b6e62b 100644
--- a/main.py
+++ b/main.py
@@ -4,7 +4,7 @@ import os
 import gitlab
 from typing import Optional
 from milestone import Milestone
-
+from datetime import datetime
 
 class UpdateMR:
     def __init__(self, project_id) -> None:
@@ -12,7 +12,8 @@ class UpdateMR:
         self.base_url = "https://community.opengroup.org/"
         self.gl = gitlab.Gitlab(url=self.base_url, private_token=self.token)
 
-        self.current_milestone = "M20 - Release 0.23"
+        # self.current_milestone = "M21 - Release 0.23"
+        self.current_milestone = Milestone.get_current_milestone()
 
         self.mrs = self.get_mrs(project_id)
 
@@ -49,7 +50,6 @@ class UpdateMR:
                 mr.save()
 
                 print(f"MR {mr.iid} updated with milestone '{milestone}' - " + mr.web_url)
-                # print(f"MR {mr.iid} updated with milestone '{milestone}' - ")
 
                 if milestone != self.current_milestone: ## Avoid closing current milestone
                     self.matching_milestones[0].state_event = "close"
@@ -106,7 +106,6 @@ class UpdateMR:
             return []
 
 
-
 projects = [
     # Data Loading
     # project_id = 94 ##open test data
diff --git a/milestone.py b/milestone.py
index 3125c1076cf6872cd54ec24450e3241b79c876ff..a9efe6fef2660ba98af0c3adb7f5b6f08e33c20b 100644
--- a/milestone.py
+++ b/milestone.py
@@ -46,12 +46,18 @@ class Milestone:
             end_date = self.parse_date(end_date)
 
             if start_date <= merged_date <= (end_date + timedelta(1)):
-                print(milestone, merged_date)
+                # print(milestone, merged_date)
                 return milestone
 
+    def get_current_milestone(self):
+        today = datetime.strftime(datetime.now(), "%Y-%m-%dT%H:%M:%S.%fZ")
+        return self.get_milestone(today)
+
+
 
 
 # test = Milestone()
+# print(test.get_current_milestone())
 # print(test.get_milestone("2022-01-21T16:24:21.321Z"))
 # print(test.get_milestone("2023-10-14T08:47:16.982Z"))
 # print(test.get_milestone("2023-10-13T08:47:16.982Z"))