diff --git a/app/database/crud.py b/app/database/crud.py
index 507c5c5..6b414f7 100644
--- a/app/database/crud.py
+++ b/app/database/crud.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime, timezone
+from datetime import datetime
 from typing import List, Optional
 
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -81,7 +81,7 @@ async def update_device(
         for key, value in update_data.items():
             setattr(device, key, value)
 
-        device.updated_at = datetime.now(timezone.utc)
+        device.updated_at = datetime.now()
         await session.commit()
         await session.refresh(device)
         logger.info(
@@ -111,7 +111,7 @@ async def delete_device(session: AsyncSession, device_id: str) -> bool:
             return False
 
         device.is_active = False
-        device.updated_at = datetime.now(timezone.utc)
+        device.updated_at = datetime.now()
         await session.commit()
         logger.info(
             "device_deleted",
@@ -139,7 +139,7 @@ async def activate_device(session: AsyncSession, device_id: str) -> bool:
             return False
 
         device.is_active = True
-        device.updated_at = datetime.now(timezone.utc)
+        device.updated_at = datetime.now()
         await session.commit()
         logger.info(
             "device_activated",
@@ -251,7 +251,7 @@ async def update_polling_target(
         for key, value in update_data.items():
             setattr(target, key, value)
 
-        target.updated_at = datetime.now(timezone.utc)
+        target.updated_at = datetime.now()
         await session.commit()
         await session.refresh(target)
         logger.info(
@@ -281,7 +281,7 @@ async def delete_polling_target(session: AsyncSession, target_id: int) -> bool:
             return False
 
         target.is_active = False
-        target.updated_at = datetime.now(timezone.utc)
+        target.updated_at = datetime.now()
         await session.commit()
         logger.info(
             "polling_target_deleted",
@@ -309,7 +309,7 @@ async def activate_polling_target(session: AsyncSession, target_id: int) -> bool
             return False
 
         target.is_active = True
-        target.updated_at = datetime.now(timezone.utc)
+        target.updated_at = datetime.now()
         await session.commit()
         logger.info(
             "polling_target_activated",
diff --git a/app/database/models.py b/app/database/models.py
index ef4ca59..9d54aa6 100644
--- a/app/database/models.py
+++ b/app/database/models.py
@@ -81,8 +81,8 @@ class ModbusDevice(SQLModel, table=True):
     max_retries: int = Field(default=5)
     retry_delay: float = Field(default=0.1)
     is_active: bool = Field(default=True, index=True)
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+    created_at: datetime = Field(default_factory=lambda: datetime.now())
+    updated_at: datetime = Field(default_factory=lambda: datetime.now())
 
 
 # Pydantic schemas for API
@@ -151,8 +151,8 @@ class PollingTarget(SQLModel, table=True):
     count: int = Field(default=1, ge=1, le=125)
     is_active: bool = Field(default=True, index=True)
     description: Optional[str] = Field(default=None, max_length=200)
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+    created_at: datetime = Field(default_factory=lambda: datetime.now())
+    updated_at: datetime = Field(default_factory=lambda: datetime.now())
 
 
 # Pydantic schemas for Polling API