diff --git a/build.gradle b/build.gradle
index 8152ef406..a4c22a8c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -109,7 +109,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'propdeps'
 
 group = 'faforever'
-version = '0.6.2'
+version = '0.6.3'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
diff --git a/src/main/java/com/faforever/api/data/domain/GameReview.java b/src/main/java/com/faforever/api/data/domain/GameReview.java
index 6f00d6150..afd4888d6 100644
--- a/src/main/java/com/faforever/api/data/domain/GameReview.java
+++ b/src/main/java/com/faforever/api/data/domain/GameReview.java
@@ -11,14 +11,12 @@
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.Table;
 
 @Setter
 @Include(rootLevel = true, type = "gameReview")
 @Entity
 @Table(name = "game_review")
-@PrimaryKeyJoinColumn(name = "review_id", referencedColumnName = "id")
 @CreatePermission(expression = "Prefab.Role.All")
 @DeletePermission(expression = IsReviewOwner.EXPRESSION)
 public class GameReview extends Review {
diff --git a/src/main/java/com/faforever/api/data/domain/MapVersionReview.java b/src/main/java/com/faforever/api/data/domain/MapVersionReview.java
index e5a45ab23..36fd381bc 100644
--- a/src/main/java/com/faforever/api/data/domain/MapVersionReview.java
+++ b/src/main/java/com/faforever/api/data/domain/MapVersionReview.java
@@ -11,14 +11,12 @@
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.Table;
 
 @Setter
 @Include(rootLevel = true, type = "mapVersionReview")
 @Entity
 @Table(name = "map_version_review")
-@PrimaryKeyJoinColumn(name = "review_id", referencedColumnName = "id")
 @CreatePermission(expression = "Prefab.Role.All")
 @DeletePermission(expression = IsReviewOwner.EXPRESSION)
 public class MapVersionReview extends Review {
diff --git a/src/main/java/com/faforever/api/data/domain/ModVersionReview.java b/src/main/java/com/faforever/api/data/domain/ModVersionReview.java
index 1e3c3410e..ee523f564 100644
--- a/src/main/java/com/faforever/api/data/domain/ModVersionReview.java
+++ b/src/main/java/com/faforever/api/data/domain/ModVersionReview.java
@@ -11,14 +11,12 @@
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.Table;
 
 @Setter
 @Include(rootLevel = true, type = "modVersionReview")
 @Entity
 @Table(name = "mod_version_review")
-@PrimaryKeyJoinColumn(name = "review_id", referencedColumnName = "id")
 @CreatePermission(expression = "Prefab.Role.All")
 @DeletePermission(expression = IsReviewOwner.EXPRESSION)
 public class ModVersionReview extends Review {
diff --git a/src/main/java/com/faforever/api/data/domain/Review.java b/src/main/java/com/faforever/api/data/domain/Review.java
index 8fffc49fb..fdb542057 100644
--- a/src/main/java/com/faforever/api/data/domain/Review.java
+++ b/src/main/java/com/faforever/api/data/domain/Review.java
@@ -1,32 +1,21 @@
 package com.faforever.api.data.domain;
 
 import com.faforever.api.data.checks.IsReviewOwner;
-import com.yahoo.elide.annotation.CreatePermission;
-import com.yahoo.elide.annotation.DeletePermission;
-import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.EqualsAndHashCode;
 import lombok.Setter;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import javax.persistence.MappedSuperclass;
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
 
 @Setter
-@Include(rootLevel = true, type = "review")
 @EqualsAndHashCode(of = "id")
-@Entity
-@Table(name = "review")
-@Inheritance(strategy = InheritanceType.JOINED)
-@CreatePermission(expression = "Prefab.Role.All")
-@DeletePermission(expression = IsReviewOwner.EXPRESSION)
+@MappedSuperclass
 public class Review extends AbstractEntity {
   private String text;
   private Byte score;