diff --git a/api/pom.xml b/api/pom.xml
index bdcdab281..f3a967d90 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -99,16 +99,6 @@
 			<artifactId>emrapi-api</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.openmrs.module</groupId>
-			<artifactId>emrapi-api-1.12</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.openmrs.module</groupId>
-			<artifactId>emrapi-api-pre2.2</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.openmrs</groupId>
 			<artifactId>event-api</artifactId>
diff --git a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept.xml b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept.xml
index 8b296ae46..7b67ca9bf 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept.xml
@@ -563,4 +563,16 @@
         <concept  concept_id="199484"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-05-26 12:34:49"  changed_by="1"  date_changed="2025-05-26 12:34:27" uuid="5bbf8572-7a5f-4d79-83df-ba5aa7d7afc7"/>
         <concept  concept_id="199485"  retired="0"  datatype_id="4"  class_id="11"  is_set="0"  creator="1"  date_created="2025-05-26 12:34:49"  changed_by="1"  date_changed="2025-05-26 12:34:27" uuid="d45e698e-1211-481a-b495-0d50918c8ebd"/>
 
+        <concept  concept_id="199500"  retired="0"  datatype_id="4"  class_id="2"  is_set="0"  creator="1"  date_created="2025-05-21 14:01:39"   changed_by="1"  date_changed="2025-05-22 13:25:20"  uuid="1a2d3a4e-5356-486a-97a5-206fea0dacb5"/>
+        <concept  concept_id="199501"  retired="0"  datatype_id="4"  class_id="5"  is_set="0"  creator="1"  date_created="2025-05-21 14:03:27"   changed_by="1"  date_changed="2025-05-22 13:10:45"  uuid="de7e9192-6a53-442f-ac0d-9ff40e5edad5"/>
+        <concept  concept_id="199502"  retired="0"  datatype_id="4"  class_id="5"  is_set="0"  creator="1"  date_created="2025-05-21 14:04:16"   changed_by="1"  date_changed="2025-05-21 14:04:16"  uuid="468cdaff-2119-41d2-986f-aeb10b6f6a2f"/>
+        <concept  concept_id="199503"  retired="0"  datatype_id="2"  class_id="1"  is_set="0"  creator="1"  date_created="2025-05-21 14:06:42"   changed_by="1"  date_changed="2025-05-22 13:06:10"  uuid="0e7d0993-c8d2-46eb-ad2d-96277df08432"/>
+        <concept  concept_id="199504"  retired="0"  datatype_id="4"  class_id="2"  is_set="0"  creator="1"  date_created="2025-05-21 14:08:40"   changed_by="1"  date_changed="2025-05-22 13:26:37"  uuid="70cd1f1b-ab94-4348-aed8-359891f24302"/>
+        <concept  concept_id="199505"  retired="0"  datatype_id="4"  class_id="2"  is_set="0"  creator="1"  date_created="2025-05-21 14:09:12"   changed_by="1"  date_changed="2025-05-22 13:27:47"  uuid="348f694c-d40c-438f-a229-5b5f1c9599ba"/>
+        <concept  concept_id="199506"  retired="0"  datatype_id="2"  class_id="7"  is_set="0"  creator="1"  date_created="2025-05-21 14:10:35"   changed_by="1"  date_changed="2025-05-22 15:09:25"  uuid="1c9548f2-fcd9-4818-9784-c8ccdd037ee3"/>
+        <concept  concept_id="199507"  retired="0"  datatype_id="3"  class_id="7"  is_set="0"  creator="1"  date_created="2025-05-21 14:13:02"   changed_by="1"  date_changed="2025-05-22 13:39:57"  uuid="b269679d-2262-4e40-9d8b-ad9a798a75ef"/>
+        <concept  concept_id="199508"  retired="0"  datatype_id="3"  class_id="7"  is_set="0"  creator="1"  date_created="2025-05-21 14:15:37"   changed_by="1"  date_changed="2025-05-22 13:43:15"  uuid="7dbfe324-9855-4f00-aa38-657dcaae737b"/>
+        <concept  concept_id="199509"  retired="0"  datatype_id="4"  class_id="10"  is_set="1"  creator="1"  date_created="2025-05-21 14:16:00"    changed_by="24"  date_changed="2025-05-22 15:04:15"  uuid="16708da8-d0e1-44c8-bca2-1323015346f5"/>
+        <concept  concept_id="199510"  retired="0"  datatype_id="3"  class_id="11"  is_set="0"  creator="24"  date_created="2025-05-21 14:55:47"   changed_by="24"  date_changed="2025-05-21 14:55:47"  uuid="161011AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+
 </dataset>
diff --git a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Answer.xml b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Answer.xml
index e6eb9b2a9..117cac124 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Answer.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Answer.xml
@@ -583,4 +583,13 @@
     <concept_answer  concept_answer_id="7375880"  concept_id="5271"   answer_concept="168869"   creator="1"  date_created="2025-05-30 00:33:49"  sort_weight="1"  uuid="6c297a27-9082-4381-bc35-2e2a9ffb829e"/>
     <concept_answer  concept_answer_id="7375881"  concept_id="5271"   answer_concept="165361"   creator="1"  date_created="2025-05-30 00:33:49"  sort_weight="2"  uuid="9f829eb2-d7a3-4cc4-a7f3-4bf4ded58dfd"/>
 
+    <concept_answer  concept_answer_id="7375882"  concept_id="199503"  answer_concept="199501"   creator="1"  date_created="2025-05-21 14:06:43"  sort_weight="2"  uuid="7195de9b-0d0f-446e-a31d-bd7f9b9945a4"/>
+    <concept_answer  concept_answer_id="7375883"  concept_id="199503"  answer_concept="5622"     creator="1"  date_created="2025-05-21 14:06:43"  sort_weight="4"  uuid="7acd430f-3c40-4935-aa4d-329008531477"/>
+    <concept_answer  concept_answer_id="7375884"  concept_id="199503"  answer_concept="199502"   creator="1"  date_created="2025-05-21 14:06:43"  sort_weight="3"  uuid="73ebb0ec-adba-4f38-bfc1-99a562cc7d8a"/>
+    <concept_answer  concept_answer_id="7375885"  concept_id="199503"  answer_concept="199500"   creator="1"  date_created="2025-05-21 14:06:43"  sort_weight="1"  uuid="59bb5608-c10d-4923-851e-7f7b7846480f"/>
+    <concept_answer  concept_answer_id="7375886"  concept_id="199506"  answer_concept="199504"   creator="1"  date_created="2025-05-21 14:10:35"  sort_weight="2"  uuid="f03d45c0-8cea-4fbd-a703-b9703aab8dc3"/>
+    <concept_answer  concept_answer_id="7375887"  concept_id="199506"  answer_concept="199505"   creator="1"  date_created="2025-05-21 14:10:35"  sort_weight="3"  uuid="1c58bddc-f54e-4ee0-bb9d-1626bd05594a"/>
+    <concept_answer  concept_answer_id="7375888"  concept_id="199506"  answer_concept="199500"   creator="1"  date_created="2025-05-21 14:10:35"  sort_weight="1"  uuid="adde8f1a-9c75-4fe1-b38c-081eb26ace07"/>
+
+
 </dataset>
diff --git a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Name.xml b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Name.xml
index 64dfaa88d..cc3b7c01d 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Name.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Name.xml
@@ -565,5 +565,18 @@
     <concept_name  concept_name_id="199499"  concept_id="199484"  name="AL-BC: Live Baby with clubfoot"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-26 12:34:27"  concept_name_type="FULLY_SPECIFIED"  voided="0" uuid="be75aed6-4988-4639-8a32-554319b68911"/>
     <concept_name  concept_name_id="199500"  concept_id="199485"  name="R - Mother referred to another health unit for further management"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-26 12:34:27"  concept_name_type="FULLY_SPECIFIED"  voided="0" uuid="035c74c6-a804-4213-9217-c76797aa716c"/>
 
+    <concept_name  concept_name_id="199501"  concept_id="166317"  name="admit to hospital old"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-21 14:01:33"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="72859ef5-1276-407a-8a97-a050d4be1f31"/>
+    <concept_name  concept_name_id="199502"  concept_id="199500"  name="Admit to hospital"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-21 14:01:39"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="d1e86cd9-dd46-462a-b2ac-8febc8861e05"/>
+    <concept_name  concept_name_id="199503"  concept_id="199501"  name="Admission denied"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-21 14:03:27"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="850111b4-4618-49c0-945b-4c2de3a9bad6"/>
+    <concept_name  concept_name_id="199504"  concept_id="199502"  name="Patient on waiting list"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-21 14:04:16"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="a18a53bd-0ff0-4748-b631-91790d1716ba"/>
+    <concept_name  concept_name_id="199505"  concept_id="199503"  name="Admission to hospital decision"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-21 14:06:42"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="27c69999-44bd-4677-b156-696d30fbc93a"/>
+    <concept_name  concept_name_id="199506"  concept_id="199504"  name="Internal facility transfer/referral"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-21 14:08:40"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="c20f85f2-a320-4834-b531-e07118627f12"/>
+    <concept_name  concept_name_id="199507"  concept_id="199505"  name="Discharge from hospital"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-21 14:09:12"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="3c2019f0-528a-46ed-9ac5-4fa7830ccc6d"/>
+    <concept_name  concept_name_id="199508"  concept_id="199506"  name="Inpatient patient disposition"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-21 14:10:35"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="922af689-0d77-41e9-9fa5-e8de3b6d9118"/>
+    <concept_name  concept_name_id="199509"  concept_id="199507"  name="Internal transfer location (text/code)"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-21 14:13:02"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="104d7da8-f661-4e77-a8cd-d5b730604f98"/>
+    <concept_name  concept_name_id="199510"  concept_id="199508"  name="Admitted to location (text/code)"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-21 14:15:37"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="e6272f25-b9cc-4370-aead-c22c5d781e41"/>
+    <concept_name  concept_name_id="199511"  concept_id="199509"  name="Inpatient disposition construct"  locale="en"  locale_preferred="1"  creator="1"  date_created="2025-05-21 14:16:00"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="ac7325ac-2d92-464d-851a-dcb47db40cec"/>
+    <concept_name  concept_name_id="199512"  concept_id="199510"  name="Free text comment"  locale="en"  locale_preferred="1"  creator="24"  date_created="2025-05-21 14:55:47"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="f2501f5c-4b9b-41af-8c75-fc557e505ca0"/>
+
 
 </dataset>
diff --git a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Reference.xml b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Reference.xml
index bc4c2042a..c9cc2c23b 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Reference.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Reference.xml
@@ -36,6 +36,27 @@
         <concept_reference_term  concept_reference_term_id="305493"  concept_source_id="21"  name="continuation phase, tuberculosis treatment"  code="159794" creator="1"  date_created="2025-05-02 19:17:43" retired="0" uuid="48f8c966-e10f-4b2a-b076-f861b616a6cf"/>
         <concept_reference_term  concept_reference_term_id="305492"  concept_source_id="21"  name="tuberculosis treatment phase"  code="159792" creator="1"  date_created="2025-05-02 19:16:10" retired="0" uuid="473817f8-1118-4dde-b021-3615be17f35b"/>
 
+        <concept_reference_term  concept_reference_term_id="305511"  concept_source_id="23"  code="Disposition"                 creator="1"  date_created="2025-05-22 13:03:42"  retired="0"   uuid="6e40a630-76e6-4092-a372-1a1c58fcac3e"/>
+        <concept_reference_term  concept_reference_term_id="305512"  concept_source_id="23"  code="Admission Decision"          creator="1"  date_created="2025-05-22 13:05:56"  retired="0"   uuid="57c46e03-9cfd-4660-91c1-b972a04dc1a1"/>
+        <concept_reference_term  concept_reference_term_id="305513"  concept_source_id="23"  code="Deny Admission"              creator="1"  date_created="2025-05-22 13:10:32"  retired="0"   uuid="e322f3e3-d210-4f36-a604-347861838018"/>
+        <concept_reference_term  concept_reference_term_id="305514"  concept_source_id="21"  code="199500"                      creator="1"  date_created="2025-05-22 13:25:06"  retired="0"   uuid="599fa4b6-f660-40fa-ad4b-d1a8cb1f6dff"/>
+        <concept_reference_term  concept_reference_term_id="305515"  concept_source_id="21"  code="199504"                      creator="1"  date_created="2025-05-22 13:26:23"  retired="0"   uuid="4a302360-17c8-4f07-8b8f-b25ad56e29ce"/>
+        <concept_reference_term  concept_reference_term_id="305516"  concept_source_id="21"  code="199505"                      creator="1"  date_created="2025-05-22 13:27:32"  retired="0"   uuid="7967ea21-ffa0-4f9f-b903-5d2fa8d880f8"/>
+        <concept_reference_term  concept_reference_term_id="305517"  concept_source_id="23"  code="Disposition Concept Set"     creator="1"  date_created="2025-05-22 13:35:42"  retired="0"   uuid="c5fcee7b-6e8e-4e52-aad4-e9a6310f7fb8"/>
+        <concept_reference_term  concept_reference_term_id="305518"  concept_source_id="21"  code="199509"                      creator="1"  date_created="2025-05-22 13:36:10"  retired="0"   uuid="dfb57eb2-94e0-4ec1-8e51-8f2e08160249"/>
+        <concept_reference_term  concept_reference_term_id="305519"  concept_source_id="23"  code="Internal Transfer Location"  creator="1"  date_created="2025-05-22 13:39:19"  retired="0"   uuid="022dfabd-1194-4ca1-9dec-08392ce12e5c"/>
+        <concept_reference_term  concept_reference_term_id="305520"  concept_source_id="21"  code="199507"                      creator="1"  date_created="2025-05-22 13:39:43"  retired="0"   uuid="a2e78dbd-f705-40aa-b934-3a00e275cd32"/>
+        <concept_reference_term  concept_reference_term_id="305521"  concept_source_id="23"  code="Admission Location"          creator="1"  date_created="2025-05-22 13:42:02"  retired="0"   uuid="db0f2c88-604d-410f-8d82-c060bda42383"/>
+        <concept_reference_term  concept_reference_term_id="305522"  concept_source_id="23"  code="199508"                      creator="1"  date_created="2025-05-22 13:42:26"  retired="0"   uuid="4ac812ad-f256-425a-8606-6a5773ba0cc5"/>
+        <concept_reference_term  concept_reference_term_id="305523"  concept_source_id="21"  code="199508"                      creator="1"  date_created="2025-05-22 13:43:06"  retired="0"   uuid="c471b455-6ed9-4154-91db-e41cee086a9c"/>
+        <concept_reference_term  concept_reference_term_id="305524"  concept_source_id="21"  code="199506"                      creator="1"  date_created="2025-05-22 15:08:44"  retired="0"   uuid="659fbce4-c9b3-477d-8a84-804b6dabf390"/>
+        <concept_reference_term  concept_reference_term_id="305525"  concept_source_id="21"  code="1114"                        creator="1"  date_created="2025-05-22 23:07:10"  retired="0"   uuid="1e7b7df0-21b4-4ac2-8502-56d932a890d4"/>
+        <concept_reference_term  concept_reference_term_id="305526"  concept_source_id="11"  code="1335"                        creator="1"  date_created="2025-05-22 23:07:22"  retired="0"   uuid="17790051-1c6d-472d-8076-bcf469fa3552"/>
+        <concept_reference_term  concept_reference_term_id="305527"  concept_source_id="13"  code="1114"                        creator="1"  date_created="2025-05-22 23:07:37"  retired="0"   uuid="052edc70-6e5c-44d0-9835-1f27c1ff1996"/>
+        <concept_reference_term  concept_reference_term_id="305528"  concept_source_id="21"  code="1599"                        creator="1"  date_created="2025-05-22 23:23:48"  retired="0"   uuid="2cd2c063-585e-4b17-b437-70a29634307e"/>
+        <concept_reference_term  concept_reference_term_id="305529"  concept_source_id="13"  code="5002"                        creator="1"  date_created="2025-05-22 23:24:02"  retired="0"   uuid="6461b35b-bfa8-44f0-a143-2e94fd4a009a"/>
+        <concept_reference_term  concept_reference_term_id="305530"  concept_source_id="1"   code="184305005"                   creator="1"  date_created="2025-05-22 23:24:27"  retired="0"   uuid="1bf9625d-2fe1-4c65-821b-af1a40565cd3"/>
+
 
         <concept_reference_map  concept_map_id="305476"  concept_reference_term_id="305490"  concept_map_type_id="1"  creator="1"  date_created="2025-04-28 16:53:01"  concept_id="90315" uuid="c9b390e4-b625-4d62-81c3-b169920afb59"/>
         <concept_reference_map  concept_map_id="305475"  concept_reference_term_id="305486"  concept_map_type_id="1"  creator="1"  date_created="2025-04-28 16:18:10"  concept_id="90220" uuid="e192c99e-0fa7-4c19-8af0-4baba6995055"/>
@@ -72,4 +93,24 @@
         <concept_reference_map  concept_map_id="305479"  concept_reference_term_id="305494"  concept_map_type_id="1"  creator="1"  date_created="2025-05-02 19:18:40"  concept_id="159795" uuid="f68df097-18b9-4e92-b7da-784ac9e14a65"/>
         <concept_reference_map  concept_map_id="305478"  concept_reference_term_id="305493"  concept_map_type_id="1"  creator="1"  date_created="2025-05-02 19:17:52"  concept_id="159794" uuid="426253c3-9ce9-4956-9ba3-76a14515f548"/>
         <concept_reference_map  concept_map_id="305477"  concept_reference_term_id="305492"  concept_map_type_id="1"  creator="1"  date_created="2025-05-02 19:16:25"  concept_id="159792" uuid="3789fba5-00a1-4c3e-ad7a-867b31f9b826"/>
+
+        <concept_reference_map  concept_map_id="305496"  concept_reference_term_id="305511"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:04:01"  concept_id="199506"  uuid="8d2df30c-6635-46f4-adff-b5616c24b3cc"/>
+        <concept_reference_map  concept_map_id="305497"  concept_reference_term_id="305512"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:06:10"  concept_id="199503"  uuid="9f30c854-a595-41a5-9f0d-d0d8b4b3bfbd"/>
+        <concept_reference_map  concept_map_id="305498"  concept_reference_term_id="305513"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:10:45"  concept_id="199501"  uuid="8490d6e6-201c-4cce-a1db-39b1a9f1c752"/>
+        <concept_reference_map  concept_map_id="305499"  concept_reference_term_id="305514"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:25:20"  concept_id="199500"  uuid="9455ab61-4a54-4641-ad21-531650a03d8e"/>
+        <concept_reference_map  concept_map_id="305500"  concept_reference_term_id="305515"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:26:37"  concept_id="199504"  uuid="1d4eaf87-637d-46cf-a313-edbbe3268ab6"/>
+        <concept_reference_map  concept_map_id="305501"  concept_reference_term_id="305516"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:27:46"  concept_id="199505"  uuid="db87602e-6e98-45ef-b579-c41695423245"/>
+        <concept_reference_map  concept_map_id="305502"  concept_reference_term_id="305517"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:36:29"  concept_id="199509"  uuid="fb61bf94-93bf-4344-a650-ec6d38d29d11"/>
+        <concept_reference_map  concept_map_id="305503"  concept_reference_term_id="305518"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:36:29"  concept_id="199509"  uuid="df19d864-345b-4b28-b7a5-d853c37f71ee"/>
+        <concept_reference_map  concept_map_id="305504"  concept_reference_term_id="305519"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:39:57"  concept_id="199507"  uuid="1ccd0f76-cbd0-4347-980e-9edf754c2e47"/>
+        <concept_reference_map  concept_map_id="305505"  concept_reference_term_id="305520"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:39:57"  concept_id="199507"  uuid="a7e3d4c8-be01-4604-b27a-74ac2cec2209"/>
+        <concept_reference_map  concept_map_id="305506"  concept_reference_term_id="305521"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:43:15"  concept_id="199508"  uuid="c2a8bca6-a35e-4737-a32d-761e9a53b2b1"/>
+        <concept_reference_map  concept_map_id="305507"  concept_reference_term_id="305523"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 13:43:15"  concept_id="199508"  uuid="99a1cc1a-ff06-4fbb-a855-c83cda735b65"/>
+        <concept_reference_map  concept_map_id="305508"  concept_reference_term_id="305524"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 15:09:25"  concept_id="199506"  uuid="e4a41881-001f-4a5e-8590-ab5520601b0e"/>
+        <concept_reference_map  concept_map_id="305509"  concept_reference_term_id="305525"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 23:08:14"  concept_id="1114"   uuid="ed0dfb86-645f-40b0-9a10-6f2ca6fa939a"/>
+        <concept_reference_map  concept_map_id="305510"  concept_reference_term_id="305526"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 23:08:14"  concept_id="1114"   uuid="b79bb993-ee95-4dcc-bb96-1f399898c4f2"/>
+        <concept_reference_map  concept_map_id="305511"  concept_reference_term_id="305527"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 23:08:14"  concept_id="1114"   uuid="2401e34f-6050-48a2-91ca-ba087993d348"/>
+        <concept_reference_map  concept_map_id="305512"  concept_reference_term_id="305530"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 23:26:11"  concept_id="5002"   uuid="fd92f2a4-3057-4796-9e33-248bbc90b07a"/>
+        <concept_reference_map  concept_map_id="305513"  concept_reference_term_id="305529"  concept_map_type_id="2"  creator="1"  date_created="2025-05-22 23:26:11"  concept_id="5002"   uuid="30124e51-46e5-4f53-8374-eea4103d5b31"/>
+        <concept_reference_map  concept_map_id="305514"  concept_reference_term_id="305528"  concept_map_type_id="1"  creator="1"  date_created="2025-05-22 23:26:11"  concept_id="5002"   uuid="ae12e7b5-2f4e-41f9-83e0-be9cbc592e11"/>
 </dataset>
\ No newline at end of file
diff --git a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Set.xml b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Set.xml
index 6b43377a6..28b1b0bf0 100644
--- a/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Set.xml
+++ b/api/src/main/resources/metadata/concepts_and_drugs/tools-2024/Concept_Set.xml
@@ -277,5 +277,8 @@
     <concept_set  concept_set_id="19812"  concept_id="168064"	concept_set="1271" sort_weight="109" creator="1" date_created="2025-04-09 06:19:41" uuid="5907967a-1771-11f0-9e19-da924fd23489"/>
     <concept_set  concept_set_id="19813"  concept_id="175333"	concept_set="1271" sort_weight="110" creator="1" date_created="2025-04-09 06:19:41" uuid="5907adea-1771-11f0-9e19-da924fd23489"/>
 
+    <concept_set  concept_set_id="19814"  concept_id="199506"  concept_set="199509"  sort_weight="0"  creator="1"  date_created="2025-05-22 13:47:43"  uuid="409c78b4-8faa-40da-ace5-04b6d677617c"/>
+    <concept_set  concept_set_id="19815"  concept_id="199507"  concept_set="199509"  sort_weight="1"  creator="1"  date_created="2025-05-22 13:47:43"  uuid="a1357212-b153-42c9-8684-9c50d851d792"/>
+    <concept_set  concept_set_id="19816"  concept_id="199508"  concept_set="199509"  sort_weight="2"  creator="1"  date_created="2025-05-22 13:47:43"  uuid="a8df15cd-c7df-45a7-a0a0-58a2d4c2d8c3"/>
 
 </dataset>
diff --git a/omod/pom.xml b/omod/pom.xml
index 04afef431..7fe9f558c 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -100,16 +100,6 @@
 			<artifactId>emrapi-api</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.openmrs.module</groupId>
-			<artifactId>emrapi-api-1.12</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.openmrs.module</groupId>
-			<artifactId>emrapi-api-pre2.2</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.openmrs.module</groupId>
 			<artifactId>formentryapp-omod</artifactId>
diff --git a/pom.xml b/pom.xml
index 0873b8dc5..9c61ed79f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
 		<dataEntryStatisticsVersion>1.8.0</dataEntryStatisticsVersion>
 		<dataexchangeVersion>1.3.8</dataexchangeVersion>
 		<dataintegrityVersion>4.4.4</dataintegrityVersion>
-		<emrapiVersion>1.35.0</emrapiVersion>
+		<emrapiVersion>2.3.0</emrapiVersion>
 		<eventVersion>2.10.0</eventVersion>
 		<openmrsAtomfeedVersion>2.6.1</openmrsAtomfeedVersion>
 		<fhir2Version>2.3.0</fhir2Version>
@@ -134,6 +134,10 @@
 
 		<!-- core configuration library -->
 		<ugandaemrReportsVersion>2.1.4</ugandaemrReportsVersion>
+		<build.timestamp.format>yyyyMMddHHmmss</build.timestamp.format>
+		<TIMESTAMP>${maven.build.timestamp}</TIMESTAMP>
+		<openmrs.version.shortnumericonly>263</openmrs.version.shortnumericonly>
+		<openmrs.version.long>2.6.3</openmrs.version.long>
 	</properties>
 
 	<dependencyManagement>
@@ -273,18 +277,6 @@
 				<version>${emrapiVersion}</version>
 				<scope>provided</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.openmrs.module</groupId>
-				<artifactId>emrapi-api-1.12</artifactId>
-				<version>${emrapiVersion}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.openmrs.module</groupId>
-				<artifactId>emrapi-api-pre2.2</artifactId>
-				<version>${emrapiVersion}</version>
-				<scope>test</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.openmrs</groupId>
 				<artifactId>event-api</artifactId>