diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
index 12ee0689984..9440c528b68 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
@@ -185,8 +185,7 @@ public class UpgradeEntity {
    * Uni-directional relationship between an upgrade an all of the components in
    * that upgrade.
    */
-  @OneToMany(orphanRemoval=true, cascade = { CascadeType.ALL })
-  @JoinColumn(name = "upgrade_id")
+  @OneToMany(orphanRemoval=true, mappedBy = "upgrade", cascade = { CascadeType.ALL })
   private List<UpgradeHistoryEntity> upgradeHistory;
 
   /**
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
index c3f97adf6f7..585329602de 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
@@ -69,7 +69,8 @@ public class UpgradeHistoryEntity {
   @Column(name = "upgrade_id", nullable = false, insertable = false, updatable = false)
   private Long upgradeId;
 
-  @JoinColumn(name = "upgrade_id", nullable = false, insertable = false, updatable = false)
+  @ManyToOne
+  @JoinColumn(name = "upgrade_id", referencedColumnName = "upgrade_id", nullable = false)
   private UpgradeEntity upgrade;
 
   @Column(name = "service_name", nullable = false, insertable = true, updatable = true)