diff --git a/eatery-service/src/main/java/com/drinkool/dtos/CreateShift.java b/eatery-service/src/main/java/com/drinkool/dtos/CreateShift.java
index 6eb1521..f0ca357 100644
--- a/eatery-service/src/main/java/com/drinkool/dtos/CreateShift.java
+++ b/eatery-service/src/main/java/com/drinkool/dtos/CreateShift.java
@@ -1,7 +1,7 @@
 package com.drinkool.dtos;
 
+import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Date;
 import lombok.NoArgsConstructor;
 import org.eclipse.microprofile.graphql.NonNull;
 
@@ -9,7 +9,7 @@ import org.eclipse.microprofile.graphql.NonNull;
 public class CreateShift {
 
 	@NonNull
-	public Date date;
+	public LocalDate date;
 
 	@NonNull
 	public LocalTime startTime;
diff --git a/eatery-service/src/main/java/com/drinkool/entities/ShiftEntity.java b/eatery-service/src/main/java/com/drinkool/entities/ShiftEntity.java
index 8f3b719..935d4a1 100644
--- a/eatery-service/src/main/java/com/drinkool/entities/ShiftEntity.java
+++ b/eatery-service/src/main/java/com/drinkool/entities/ShiftEntity.java
@@ -8,9 +8,9 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 @Entity
@@ -22,7 +22,7 @@ public class ShiftEntity extends BaseEntity {
 	public EateryEntity eatery;
 
 	@Column(nullable = false)
-	public Date date;
+	public LocalDate date;
 
 	@Column(nullable = false)
 	public LocalTime startTime;
diff --git a/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java b/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java
index fa0f782..a814b4f 100644
--- a/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java
+++ b/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java
@@ -34,7 +34,7 @@ public class ShiftRegistrationEntity extends BaseEntity {
 			staffId,
 			registratingShift.endTime,
 			registratingShift.startTime,
-			new Timestamp(registratingShift.date.getTime())
+			registratingShift.date
 		);
 	}
 }