diff --git a/api/src/main/java/org/openmrs/RelationshipType.java b/api/src/main/java/org/openmrs/RelationshipType.java
index 0a7bdfa6e90..3e782f9c926 100644
--- a/api/src/main/java/org/openmrs/RelationshipType.java
+++ b/api/src/main/java/org/openmrs/RelationshipType.java
@@ -9,6 +9,13 @@
  */
 package org.openmrs;
 
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.envers.Audited;
 
@@ -33,21 +40,37 @@
  * In English, we run into a tricky RelationshipType with aunts and uncles. We have chosen to define
  * them as aunt/uncle-niece/nephew.
  */
+@Entity
+@Table(name = "relationship_type")
 @Audited
+/**
+ * The 'name' property is inherited from BaseChangeableOpenmrsMetadata, but the 
+ * relationship_type table does not have a 'name' column. It uses 'a_is_to_b' 
+ * and 'b_is_to_a' instead.
+ * * We map 'name' to 'a_is_to_b' (read-only) to satisfy the Hibernate requirement 
+ * for the inherited field without breaking the legacy schema.
+ */
+@AttributeOverride(name = "name", column = @Column(name = "a_is_to_b", length = 50, insertable = false, updatable = false))
 public class RelationshipType extends BaseChangeableOpenmrsMetadata{
 	
 	public static final long serialVersionUID = 4223L;
 	
 	// Fields
-	
+	@Id
+	@Column(name = "relationship_type_id")
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Integer relationshipTypeId;
 	
+	@Column(name = "a_is_to_b", nullable = false, length = 50) 
 	private String aIsToB;
 	
+	@Column (name = "b_is_to_a", nullable = false, length = 50)
 	private String bIsToA;
 	
+	@Column (nullable = false)
 	private Integer weight = 0;
 	
+	@Column (nullable = false)
 	private Boolean preferred = false;
 	
 	// Constructors
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 3a12ab71b2b..eaf0ef7ea51 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -39,7 +39,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/Role.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Patient.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/PatientProgramAttribute.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/RelationshipType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Order.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderAttributeType.hbm.xml" />
@@ -75,6 +74,8 @@
 		<!-- These mappings are required because of references in Obs & Concept -->
 		<mapping class="org.openmrs.ObsReferenceRange"/>
 		<mapping class="org.openmrs.ConceptReferenceRange"/>
+		
+		<mapping class="org.openmrs.RelationshipType"/>
   </session-factory>
 
 </hibernate-configuration>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/RelationshipType.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/RelationshipType.hbm.xml
deleted file mode 100644
index 1bd18ffd827..00000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/RelationshipType.hbm.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    This Source Code Form is subject to the terms of the Mozilla Public License,
-    v. 2.0. If a copy of the MPL was not distributed with this file, You can
-    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
-    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
-
-    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
-    graphic logo is a trademark of OpenMRS Inc.
-
--->
-<!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">   
-<hibernate-mapping package="org.openmrs">
-
-<class name="RelationshipType" table="relationship_type">
-
-	<id name="relationshipTypeId" type="java.lang.Integer" column="relationship_type_id" unsaved-value="0">
-		<generator class="native">
-			<param name="sequence">relationship_type_relationship_type_id_seq</param>
-		</generator>
-	</id>
-
-    
-
-    <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-
-    <property name="aIsToB" type="java.lang.String" not-null="true" length="50" access="field" column="a_is_to_b"/> <!-- Accessing field so we don't have to use getaIsToB() -->
-    
-    <property name="bIsToA" type="java.lang.String" not-null="true" length="50" access="field" column="b_is_to_a"/> <!-- Accessing field so we don't have to use getbIsToA() -->
-    
-    <property name="description" type="java.lang.String" length="255"/>
-    
-    <property name="preferred" type="boolean" not-null="true"/>
-    
-    <property name="weight" type="java.lang.Integer" not-null="true" length="255"/>
-    
-    <property name="dateCreated" type="java.util.Date" column="date_created" not-null="true" length="19"/>
-
-    <!-- Associations -->
-  
-    <!-- bi-directional many-to-one association to User -->
-    <many-to-one name="creator" class="org.openmrs.User" not-null="true">
-        <column name="creator" />
-    </many-to-one>
-    
-    <many-to-one name="retiredBy" class="User" column="retired_by" />
-	<property name="dateRetired" type="java.util.Date"
-			column="date_retired" length="19" />
-	<property name="retireReason" type="java.lang.String"
-			column="retire_reason" length="255" />
-	<property name="retired" type="boolean" column="retired"
-			length="1" not-null="true" />
-
-    <many-to-one name="changedBy" class="org.openmrs.User" column="changed_by"/>
-    <property name="dateChanged" type="java.util.Date"
-              column="date_changed" length="19"/>
-</class>
-</hibernate-mapping>