diff --git a/backend/app/repositories.py b/backend/app/repositories.py
index d53464a..9f08d8b 100644
--- a/backend/app/repositories.py
+++ b/backend/app/repositories.py
@@ -112,9 +112,9 @@ async def _create_trigger_data(self, schedule_data: dict) -> tuple[dict, dict]:
         }
 
         stop_date_time: datetime = datetime.combine(
-            date.today(), start_time
+            date.today(), start_time, tzinfo=start_time.tzinfo
         ) + timedelta(minutes=duration)
-        stop_time: datetime.time = stop_date_time.time()
+        stop_time: datetime.time = stop_date_time.timetz()
         stop_data: dict = {
             "hour": stop_time.hour,
             "minute": stop_time.minute,
diff --git a/backend/tests/unit/test_trigger_creation.py b/backend/tests/unit/test_ap_scheduler_repository.py
similarity index 100%
rename from backend/tests/unit/test_trigger_creation.py
rename to backend/tests/unit/test_ap_scheduler_repository.py