diff --git a/worker_voucher/migrations/0006_alter_historicalworkervoucher_date_created_and_more.py b/worker_voucher/migrations/0006_alter_historicalworkervoucher_date_created_and_more.py
new file mode 100644
index 0000000..2fc47f0
--- /dev/null
+++ b/worker_voucher/migrations/0006_alter_historicalworkervoucher_date_created_and_more.py
@@ -0,0 +1,48 @@
+# Generated by Django 4.2.15 on 2024-08-13 10:50
+
+import core.fields
+import datetime
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('worker_voucher', '0005_assign_voucher_rigths'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='historicalworkervoucher',
+            name='date_created',
+            field=core.fields.DateTimeField(db_column='DateCreated', default=datetime.datetime.now, null=True),
+        ),
+        migrations.AlterField(
+            model_name='historicalworkervoucher',
+            name='date_updated',
+            field=core.fields.DateTimeField(db_column='DateUpdated', default=datetime.datetime.now, null=True),
+        ),
+        migrations.AlterField(
+            model_name='workervoucher',
+            name='date_created',
+            field=core.fields.DateTimeField(db_column='DateCreated', default=datetime.datetime.now, null=True),
+        ),
+        migrations.AlterField(
+            model_name='workervoucher',
+            name='date_updated',
+            field=core.fields.DateTimeField(db_column='DateUpdated', default=datetime.datetime.now, null=True),
+        ),
+        migrations.AlterField(
+            model_name='workervoucher',
+            name='user_created',
+            field=models.ForeignKey(db_column='UserCreatedUUID', on_delete=django.db.models.deletion.DO_NOTHING, related_name='%(class)s_user_created', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='workervoucher',
+            name='user_updated',
+            field=models.ForeignKey(db_column='UserUpdatedUUID', on_delete=django.db.models.deletion.DO_NOTHING, related_name='%(class)s_user_updated', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/worker_voucher/migrations/0007_alter_historicalworkervoucher_assigned_date_and_more.py b/worker_voucher/migrations/0007_alter_historicalworkervoucher_assigned_date_and_more.py
new file mode 100644
index 0000000..1ea23cf
--- /dev/null
+++ b/worker_voucher/migrations/0007_alter_historicalworkervoucher_assigned_date_and_more.py
@@ -0,0 +1,34 @@
+# Generated by Django 4.2.15 on 2024-10-03 14:56
+
+import core.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('worker_voucher', '0006_alter_historicalworkervoucher_date_created_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='historicalworkervoucher',
+            name='assigned_date',
+            field=core.fields.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='historicalworkervoucher',
+            name='expiry_date',
+            field=core.fields.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='workervoucher',
+            name='assigned_date',
+            field=core.fields.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='workervoucher',
+            name='expiry_date',
+            field=core.fields.DateTimeField(blank=True, null=True),
+        ),
+    ]
diff --git a/worker_voucher/models.py b/worker_voucher/models.py
index 67936cb..2091aae 100644
--- a/worker_voucher/models.py
+++ b/worker_voucher/models.py
@@ -22,8 +22,8 @@ class Status(models.TextChoices):
     code = models.CharField(max_length=255, blank=True, null=True)
     status = models.CharField(max_length=255, blank=True, null=True, choices=Status.choices,
                               default=Status.AWAITING_PAYMENT)
-    assigned_date = fields.DateField(blank=True, null=True)
-    expiry_date = fields.DateField(blank=True, null=True)
+    assigned_date = fields.DateTimeField(blank=True, null=True)
+    expiry_date = fields.DateTimeField(blank=True, null=True)
 
     @classmethod
     def get_queryset(cls, queryset, user):
diff --git a/worker_voucher/services.py b/worker_voucher/services.py
index 77ff48e..c2b0bfb 100644
--- a/worker_voucher/services.py
+++ b/worker_voucher/services.py
@@ -220,10 +220,10 @@ def _get_voucher_expiry_date(start_date: datetime):
     expiry_type = WorkerVoucherConfig.voucher_expiry_type
 
     if expiry_type == "end_of_year":
-        expiry_date = datetime.date(start_date.year, 12, 31)
+        expiry_date = datetime.datetime(start_date.year, 12, 31, 23, 59, 59)
     elif expiry_type == "fixed_period":
         expiry_period = WorkerVoucherConfig.voucher_expiry_period
-        expiry_date = datetime.date.today() + datetime.datetimedelta(**expiry_period)
+        expiry_date = datetime.datetime.today() + datetime.datetimedelta(**expiry_period)
     else:
         raise VoucherException(_("Invalid voucher expiry type"))
 
@@ -274,7 +274,7 @@ def get_worker_yearly_voucher_count_counts(insuree: Insuree, user: User, year):
 
 
 def create_assigned_voucher(user, date, insuree_id, policyholder_id):
-    current_date = datetime.date.today()
+    current_date = datetime.datetime.today()
     expiry_date = _get_voucher_expiry_date(current_date)
 
     voucher_service = WorkerVoucherService(user)