diff --git a/data/database.py b/data/database.py
index 1f18b8d84..0e724c6b0 100644
--- a/data/database.py
+++ b/data/database.py
@@ -282,6 +282,7 @@ def uuid_generator():
 
 
 get_epoch_timestamp = lambda: int(time.time())
+get_epoch_timestamp_ms = lambda: int(time.time() * 1000)
 
 
 def close_db_filter(_):
@@ -1142,8 +1143,8 @@ class Tag(BaseModel):
   name = CharField()
   repository = ForeignKeyField(Repository)
   manifest_list = ForeignKeyField(ManifestList)
-  lifetime_start = IntegerField(default=get_epoch_timestamp)
-  lifetime_end = IntegerField(null=True, index=True)
+  lifetime_start = BigIntegerField(default=get_epoch_timestamp_ms)
+  lifetime_end = BigIntegerField(null=True, index=True)
   hidden = BooleanField(default=False)
   reverted = BooleanField(default=False)