diff --git a/3-0-jpa-and-hibernate/3-0-0-hello-jpa-entity/src/main/java/com/bobocode/model/Movie.java b/3-0-jpa-and-hibernate/3-0-0-hello-jpa-entity/src/main/java/com/bobocode/model/Movie.java
index 1ca6d55f..d1bf47c7 100644
--- a/3-0-jpa-and-hibernate/3-0-0-hello-jpa-entity/src/main/java/com/bobocode/model/Movie.java
+++ b/3-0-jpa-and-hibernate/3-0-0-hello-jpa-entity/src/main/java/com/bobocode/model/Movie.java
@@ -4,7 +4,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 /**
  * TODO: you're job is to implement mapping for JPA entity {@link Movie}
diff --git a/3-0-jpa-and-hibernate/3-1-1-employee-profile/src/main/java/com/bobocode/model/Employee.java b/3-0-jpa-and-hibernate/3-1-1-employee-profile/src/main/java/com/bobocode/model/Employee.java
index 914e38d9..24f7e56c 100644
--- a/3-0-jpa-and-hibernate/3-1-1-employee-profile/src/main/java/com/bobocode/model/Employee.java
+++ b/3-0-jpa-and-hibernate/3-1-1-employee-profile/src/main/java/com/bobocode/model/Employee.java
@@ -4,7 +4,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 /**
  * todo:
diff --git a/3-0-jpa-and-hibernate/3-1-1-employee-profile/src/main/java/com/bobocode/model/EmployeeProfile.java b/3-0-jpa-and-hibernate/3-1-1-employee-profile/src/main/java/com/bobocode/model/EmployeeProfile.java
index e6309004..1b9dd20e 100644
--- a/3-0-jpa-and-hibernate/3-1-1-employee-profile/src/main/java/com/bobocode/model/EmployeeProfile.java
+++ b/3-0-jpa-and-hibernate/3-1-1-employee-profile/src/main/java/com/bobocode/model/EmployeeProfile.java
@@ -4,7 +4,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 /**
  * todo:
diff --git a/3-0-jpa-and-hibernate/3-1-2-company-products/src/main/java/com/bobocode/model/Company.java b/3-0-jpa-and-hibernate/3-1-2-company-products/src/main/java/com/bobocode/model/Company.java
index 551bf545..0d5076fa 100644
--- a/3-0-jpa-and-hibernate/3-1-2-company-products/src/main/java/com/bobocode/model/Company.java
+++ b/3-0-jpa-and-hibernate/3-1-2-company-products/src/main/java/com/bobocode/model/Company.java
@@ -1,9 +1,8 @@
 package com.bobocode.model;
 
-import com.bobocode.util.ExerciseNotCompletedException;
+import jakarta.persistence.*;
 import lombok.*;
 
-import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/3-0-jpa-and-hibernate/3-1-2-company-products/src/main/java/com/bobocode/model/Product.java b/3-0-jpa-and-hibernate/3-1-2-company-products/src/main/java/com/bobocode/model/Product.java
index 6a554f6e..b3d327cf 100644
--- a/3-0-jpa-and-hibernate/3-1-2-company-products/src/main/java/com/bobocode/model/Product.java
+++ b/3-0-jpa-and-hibernate/3-1-2-company-products/src/main/java/com/bobocode/model/Product.java
@@ -5,7 +5,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 /**
  * todo:
diff --git a/3-0-jpa-and-hibernate/3-2-2-photo-comment-dao/src/main/java/com/bobocode/model/Photo.java b/3-0-jpa-and-hibernate/3-2-2-photo-comment-dao/src/main/java/com/bobocode/model/Photo.java
index 45352479..fd24dd0c 100644
--- a/3-0-jpa-and-hibernate/3-2-2-photo-comment-dao/src/main/java/com/bobocode/model/Photo.java
+++ b/3-0-jpa-and-hibernate/3-2-2-photo-comment-dao/src/main/java/com/bobocode/model/Photo.java
@@ -3,7 +3,7 @@
 import com.bobocode.util.ExerciseNotCompletedException;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/3-0-jpa-and-hibernate/3-2-2-photo-comment-dao/src/main/java/com/bobocode/model/PhotoComment.java b/3-0-jpa-and-hibernate/3-2-2-photo-comment-dao/src/main/java/com/bobocode/model/PhotoComment.java
index 444e2adf..a322ac7a 100644
--- a/3-0-jpa-and-hibernate/3-2-2-photo-comment-dao/src/main/java/com/bobocode/model/PhotoComment.java
+++ b/3-0-jpa-and-hibernate/3-2-2-photo-comment-dao/src/main/java/com/bobocode/model/PhotoComment.java
@@ -5,7 +5,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 /**