diff --git a/api/src/main/java/org/openmrs/OrderSet.java b/api/src/main/java/org/openmrs/OrderSet.java
index b8d904aff6e8..bb9ee05cb432 100644
--- a/api/src/main/java/org/openmrs/OrderSet.java
+++ b/api/src/main/java/org/openmrs/OrderSet.java
@@ -12,7 +12,23 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.AssociationOverride;
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.envers.Audited;
+import org.hibernate.type.SqlTypes;
 import org.openmrs.api.APIException;
 
 /**
@@ -21,7 +37,13 @@
  * 
  * @since 1.12
  */
+@Entity
+@Table(name = "order_set")
 @Audited
+@AssociationOverride(
+	name = "attributes",
+	joinColumns = @JoinColumn(name = "order_set_id")
+)
 public class OrderSet extends BaseCustomizableMetadata<OrderSetAttribute> {
 	
 	public static final long serialVersionUID = 72232L;
@@ -36,12 +58,23 @@ public enum Operator {
 		ALL, ONE, ANY
 	}
 	
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name ="order_set_id" )
 	private Integer orderSetId;
 	
+	@Enumerated(EnumType.STRING)
+	@JdbcTypeCode(SqlTypes.VARCHAR)
+	@Column(name = "operator", nullable = false)
 	private Operator operator;
-	
+
+	@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+	@JoinColumn(name = "order_set_id", nullable = false)
+	@OrderColumn(name = "sequence_number")
 	private List<OrderSetMember> orderSetMembers;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "category")
 	private Concept category;
 
 	/**
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 7dffa47ed422..2bf1c8b04cf1 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -44,7 +44,6 @@
 		<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" />
-		<mapping resource="org/openmrs/api/db/hibernate/OrderSet.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderSetMember.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderSetAttributeType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderSetAttribute.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml
deleted file mode 100644
index 8e7e228dd9e7..000000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml
+++ /dev/null
@@ -1,79 +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.1//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.openmrs">
-
-    <class name="OrderSet" table="order_set">
-
-        <id name="orderSetId" type="int" column="order_set_id" unsaved-value="0">
-            <generator class="native">
-                <param name="sequence">order_set_order_set_id_seq</param>
-            </generator>
-        </id>
-
-        <property name="name" type="java.lang.String"
-                  column="name" not-null="true" />
-        <property name="description" type="java.lang.String"
-                  column="description" not-null="true" />
-        <property name="operator" column="operator" not-null="true">
-            <type name="org.hibernate.type.EnumType">
-                <param name="enumClass">org.openmrs.OrderSet$Operator</param>
-                <param name="useNamed">true</param>
-            </type>
-        </property>
-
-        <many-to-one name="category" class="org.openmrs.Concept"
-			not-null="false" column="category" />
-
-        <list name="orderSetMembers" lazy="true" cascade="save-update" inverse="false">
-            <key column="order_set_id" not-null="true"/>
-            <list-index column="sequence_number"/>
-            <one-to-many class="OrderSetMember" />
-        </list>
-
-
-        <!-- bi-directional many-to-one association to User -->
-        <many-to-one name="creator" class="User" not-null="true">
-            <column name="creator"/>
-        </many-to-one>
-        <property name="dateCreated" type="java.util.Date"
-                  column="date_created" not-null="true" length="19" />
-        <property name="retired" type="java.lang.Boolean"
-                  column="retired" length="1" not-null="true"/>
-        <!-- bi-directional many-to-one association to User -->
-        <many-to-one name="retiredBy" class="User">
-            <column name="retired_by" />
-        </many-to-one>
-        <property name="retireReason" type="java.lang.String"
-                  column="retire_reason" length="255" />
-        <property name="dateRetired" type="java.util.Date"
-                  column="date_retired" length="19" />
-        <!-- bi-directional many-to-one association to User -->
-        <many-to-one name="changedBy" class="User">
-            <column name="changed_by" />
-        </many-to-one>
-        <property name="dateChanged" type="java.util.Date"
-                  column="date_changed" length="19" />
-        <property name="uuid" type="java.lang.String"
-                  column="uuid" length="38" unique="true" not-null="true"/>
-          <set name="attributes" lazy="true" inverse="true" batch-size="100"
-            cascade="all-delete-orphan" order-by="voided asc">
-            <key column="order_set_id" />
-            <one-to-many class="OrderSetAttribute" />
-        </set>        
-
-    </class>
-
-</hibernate-mapping>
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
index 89297ec50c2d..e0b7920a42ce 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -2936,6 +2936,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 				.addAnnotatedClass(Privilege.class)
 				.addAnnotatedClass(LoginCredential.class)
 				.addAnnotatedClass(ConceptDatatype.class)
+				.addAnnotatedClass(OrderSet.class)
 				.getMetadataBuilder().build();