diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignment.java b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignment.java
index f204a93..2fc484b 100644
--- a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignment.java
+++ b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignment.java
@@ -9,7 +9,7 @@ import java.time.ZonedDateTime;
 import java.util.UUID;
 
 @Entity
-@Inheritance(strategy = InheritanceType.JOINED)
+@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 public abstract class StudentAssignment {
 
     @Id
diff --git a/src/main/resources/db/migration/V19__STUDENT_ASSIGNMENT_TABLE_PER_CLASS.sql b/src/main/resources/db/migration/V19__STUDENT_ASSIGNMENT_TABLE_PER_CLASS.sql
new file mode 100644
index 0000000..446860d
--- /dev/null
+++ b/src/main/resources/db/migration/V19__STUDENT_ASSIGNMENT_TABLE_PER_CLASS.sql
@@ -0,0 +1,35 @@
+alter table student_exercise_assignment
+    add column max_score bigint;
+alter table student_exercise_assignment
+    add column score bigint;
+alter table student_exercise_assignment
+    add column submission_date timestamp(6) with time zone;
+alter table student_exercise_assignment
+    add column assignment_id uuid;
+alter table student_exercise_assignment
+    add column student_name varchar(255);
+alter table student_exercise_assignment
+    add constraint fk_assignment foreign key (assignment_id) references assignment;
+alter table student_exercise_assignment
+    add constraint fk_classroom_user foreign key (student_name) references classroom_user;
+alter table student_exercise_assignment
+    drop constraint fk_student_assignment;
+
+alter table student_quiz_assignment
+    add column max_score bigint;
+alter table student_quiz_assignment
+    add column score bigint;
+alter table student_quiz_assignment
+    add column submission_date timestamp(6) with time zone;
+alter table student_quiz_assignment
+    add column assignment_id uuid;
+alter table student_quiz_assignment
+    add column student_name varchar(255);
+alter table student_quiz_assignment
+    add constraint fk_assignment foreign key (assignment_id) references assignment;
+alter table student_quiz_assignment
+    add constraint fk_classroom_user foreign key (student_name) references classroom_user;
+alter table student_quiz_assignment
+    drop constraint fk_student_assignment;
+
+drop table student_assignment;