diff --git a/app/models/otp.py b/app/models/otp.py
index bb09e56..6417f51 100644
--- a/app/models/otp.py
+++ b/app/models/otp.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 
 from sqlalchemy import Column, DateTime, Integer, String
 
@@ -13,8 +13,8 @@ class OTP(Base):
     name = Column(String, nullable=False)
     password = Column(String, nullable=True)
     is_active = Column(Integer, default=1)  # 1 for True, 0 for False
-    created_at = Column(DateTime, default=datetime.utcnow)
-    expires_at = Column(DateTime, nullable=False)
+    created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    expires_at = Column(DateTime(timezone=True), nullable=False)
 
     def is_expired(self):
-        return datetime.utcnow() > self.expires_at
+        return datetime.now(timezone.utc) > self.expires_at