diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 6484f9052..97ceb9582 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -22,4 +22,4 @@ jobs:
           cache: 'maven'
 
       - name: Build and Test
-        run: mvn --batch-mode --update-snapshots --activate-profiles distro,validator clean package
+        run: mvn --batch-mode --update-snapshots --activate-profiles distro,validator clean verify
diff --git a/Dockerfile b/Dockerfile
index 7e10eecdc..ce9231ec2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,11 +14,12 @@ COPY distro ./distro/
 # Build the distro, but only deploy from the amd64 build
 RUN --mount=type=secret,id=m2settings,target=/usr/share/maven/ref/settings-docker.xml if [[ "$MVN_ARGS" != "deploy" || "$(arch)" = "x86_64" ]]; then mvn $MVN_ARGS_SETTINGS $MVN_ARGS; else mvn $MVN_ARGS_SETTINGS install; fi
 
-RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs.war /openmrs/distribution/openmrs_core/
+RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs_core/openmrs.war /openmrs/distribution/openmrs_core/
 
 RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs-distro.properties /openmrs/distribution/
-RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/modules /openmrs/distribution/openmrs_modules
-RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/owa /openmrs/distribution/openmrs_owas
+RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_modules /openmrs/distribution/openmrs_modules/
+RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_owas /openmrs/distribution/openmrs_owas/
+RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_config /openmrs/distribution/openmrs_config/
 
 # Clean up after copying needed artifacts
 RUN mvn $MVN_ARGS_SETTINGS clean
@@ -33,4 +34,4 @@ COPY --from=dev /openmrs/distribution/openmrs_core/openmrs.war /openmrs/distribu
 COPY --from=dev /openmrs/distribution/openmrs-distro.properties /openmrs/distribution/
 COPY --from=dev /openmrs/distribution/openmrs_modules /openmrs/distribution/openmrs_modules
 COPY --from=dev /openmrs/distribution/openmrs_owas /openmrs/distribution/openmrs_owas
-COPY --from=dev /openmrs_distro/distro/configuration /openmrs/distribution/openmrs_config
+COPY --from=dev  /openmrs/distribution/openmrs_config /openmrs/distribution/openmrs_config
diff --git a/distro/configuration/conceptclasses/conceptclasses-core_data.csv b/distro/configuration/conceptclasses/conceptclasses-core_data.csv
deleted file mode 100644
index f71ce26db..000000000
--- a/distro/configuration/conceptclasses/conceptclasses-core_data.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-Uuid,Void/Retire,Name,Description
-b4535251-9183-4175-959e-9ee67dc71e78,,Pharmacologic Drug Class,Class of medications based on pharmacologic properties as opposed to therapeutic properties
-e30d8601-07f8-413a-9d11-cdfbb28196ec,,Units of Measure,For prescribing and dispensing
-1edca11a-768a-102f-83f4-12313b04a615,,Workflow,Workflow class
-1edca23c-768a-102f-83f4-12313b04a615,,State,Workflow state
-1edca368-768a-102f-83f4-12313b04a615,,Program,Program concept
-896d8b8c-603b-421f-959e-8d305cbeeb82,,Indicator,An indicator calculated from certain measures
-89a98300-062e-4003-8f6f-764ea23ab648,,Organism,Class of living organisms
-8caa332c-efe4-4025-8b18-3398328e1323,,Radiology/Imaging Procedure,A radiology or imaging test or procedure
-de359f23-2bfc-4e8d-96d8-25b7526d6070,,Drug form,Medication form for prescribing
-e2c52f55-c7b4-49f7-9f82-1ffa2fe6023f,,InteractSet,Set of drugs that interact with parent drug
-0dcf23d4-3008-4d8e-b12c-4ec95d1cfd97,,Medical supply,Durable medical equipment and other supplies
\ No newline at end of file
diff --git a/distro/configuration/conceptsources/conceptsources-core_data.csv b/distro/configuration/conceptsources/conceptsources-core_data.csv
deleted file mode 100644
index 3d27aca61..000000000
--- a/distro/configuration/conceptsources/conceptsources-core_data.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-UUID,Void/Retire,Name,Description,HL7 Code,Unique ID
-1ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,SNOMED CT,SNOMED Preferred mapping,SCT,
-2ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,SNOMED NP,Non-preferred SNOMED CT mappings,,
-4ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,RxNORM,RxNORM CUI,,
-5ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,RxNORM Comb,RxNORM Combination generics MVP Code,,
-6ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,LOINC,LOINC code,,
-12ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,PIH Malawi,Partners in Health Malawi concept dictionary,,
-13ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,AMPATH,AMPATH concept dictionary,,
-14ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,SNOMED MVP,MVP Namespace Identifier extensions to SNOMED CT,,
-18ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,HL7 2.x Route of Administration,Members of value set from HL7 for routes of administration,HL70162,
-19ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,3BT,Belgian Bilingual Bi-encoded Thesaurus (3BT),,
-20ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,ICPC2,International Classification of Primary Care version 2 from WONCA.,,
-21ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,CIEL,Columbia International eHealth Laboratory concept ID,,
-24ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,IMO ProblemIT,"Intelligent Medical Objects, Inc. problem/disease/finding datasource",,
-25ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,IMO ProcedureIT,"Intelligent Medical Objects, Inc. procedure/test datasource",,
-27ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,NDF-RT NUI,Unique numeric indicator from NDF-RT drug information database,,
-28ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,FDA Route of Administration,"Description.  This standard provides for all routes of administration for drugs. Source.  COMIS Reference table (which is used by the Drug Product Reference File to generate Approved Drug Products with Therapeutic Equivalence Evaluations (a.k.a. ""The Orange Book"")), and the Drug Registration and Listing Database, Office of Epidemiology and Biosurveillance Database.  Also, the names (but not the definitions or the numeric codes) that are represented in blue have been harmonized with the E2B route of administration terms for the International Conference on Harmonization (ICH).",,
-29ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,NCI Concept Code,"National Cancer Institute concept code URL: http://nciterms.nci.nih.gov/ncitbrowser/ConceptReport.jsp?dictionary=NCI_Thesaurus",,
-34ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,MED-RT NUI,VHA's Medication Reference Terminology,,
-fb9aaaf1-65e2-4c18-b53c-16b575f2f385,,PIH,Equivalent concept ID in Master Partners-in-Health Concept dictionary,,
-4faa9f66-d80f-4685-9645-af206fce7fa5,,ICD-10,"International Classification of Diseases, 10th Revision (ICD-10)",ICD-10,
-ddb6b595-0b85-4a80-9243-efe4ba404eef,,org.openmrs.module.mdrtb,The required concepts for the MDR-TB module,,
-9e2cf36d-5eb2-44b6-945a-6d456aa50794,,org.openmrs.module.emrapi,The required concepts for the EMRAPI module,,
-1b880698-489f-59ed-bd5b-f42a2f5c8e81,,HL7-MedicationDispenseStatus,Medication dispense status for FHIR,,
-50ef5518-f4e3-4c49-9352-0002202005e9,,ANCDAK,WHO SMART Guideline Data Elements,,
diff --git a/distro/configuration/fhirconceptsources/fhir_concept_sources-core_data.csv b/distro/configuration/fhirconceptsources/fhir_concept_sources-core_data.csv
deleted file mode 100644
index 47ea37b86..000000000
--- a/distro/configuration/fhirconceptsources/fhir_concept_sources-core_data.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-Uuid,Void/Retire,Concept source,Url,_order:1000
-2b3c1ff8-768a-102f-83f4-12313b04a615,,CIEL,https://cielterminology.org,,
-249b13c8-72fa-4b96-8d3d-b200efed985e,,LOINC,http://loinc.org,,
-89532052-e89d-4a73-a760-5d6a6a9ce348,,SNOMED CT,http://snomed.info/sct/,,
-a7099e7e-a77f-48e6-9fad-aa441bd2df23,,HL7-MedicationDispenseStatus,http://terminology.hl7.org/CodeSystem/medicationdispense-status,
-dceac564-417d-40d0-a457-078b3f1fec5a,,ANCDAK,http://fhir.org/guides/who/anc-cds/CodeSystem/anc-custom-codes,,
diff --git a/distro/configuration/globalproperties/globalproperties-core_data.xml b/distro/configuration/globalproperties/globalproperties-core_data.xml
deleted file mode 100644
index a816f9fb8..000000000
--- a/distro/configuration/globalproperties/globalproperties-core_data.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<config>
-    <globalProperties>
-        <globalProperty>
-            <property>concept.true</property>
-            <value>1</value>
-        </globalProperty>
-        <globalProperty>
-            <property>concept.false</property>
-            <value>2</value>
-        </globalProperty>
-        <globalProperty>
-            <property>visits.assignmentHandler</property>
-            <value>org.openmrs.api.handler.ExistingVisitAssignmentHandler</value>
-        </globalProperty>    
-        <globalProperty>
-            <property>visits.allowOverlappingVisits</property>
-            <value>false</value>
-        </globalProperty>
-    </globalProperties>
-</config>
diff --git a/distro/configuration/locationtags/locationtags-core_demo.csv b/distro/configuration/locationtags/locationtags-core_demo.csv
deleted file mode 100644
index 3c3dddaa2..000000000
--- a/distro/configuration/locationtags/locationtags-core_demo.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-Uuid,Void/Retire,Name,Description
-b8bbf83e-645f-451f-8efe-a0db56f09676,,Login Location,"When a user logs in and chooses a session location, they may only choose one with this tag"
-a2327745-2970-4752-ac8a-dd0ba131f40e,,Facility Location,
-,,Queue Location,
-f5b9737b-14d5-402b-8475-dd558808e172,,Admission Location,Patients may only be admitted to inpatient care in a location with this tag
-9783aba6-df7b-4969-be6e-1e03e7a08965,,Transfer Location,Patients may only be transfer to inpatient care in a location with this tag
-e2a1b3c4-d5e6-7890-1abc-def234567890,,Visit Location,A location where a patient may have a visit
\ No newline at end of file
diff --git a/distro/configuration/ocl/openmrs_CIELImmunizationContent_v9_autoexpand-9.2023-10-29_230040.zip b/distro/configuration/ocl/openmrs_CIELImmunizationContent_v9_autoexpand-9.2023-10-29_230040.zip
deleted file mode 100644
index 92ebd638f..000000000
Binary files a/distro/configuration/ocl/openmrs_CIELImmunizationContent_v9_autoexpand-9.2023-10-29_230040.zip and /dev/null differ
diff --git a/distro/configuration/ocl/openmrs_PD_v7_autoexpand-7.2024-06-04_200232.zip b/distro/configuration/ocl/openmrs_PD_v7_autoexpand-7.2024-06-04_200232.zip
deleted file mode 100644
index 320e4af99..000000000
Binary files a/distro/configuration/ocl/openmrs_PD_v7_autoexpand-7.2024-06-04_200232.zip and /dev/null differ
diff --git a/distro/distro.properties b/distro/distro.properties
index 98c16e8a1..9b2f18697 100644
--- a/distro/distro.properties
+++ b/distro/distro.properties
@@ -33,3 +33,4 @@ omod.event=${event.version}
 omod.bedmanagement=${bedmanagement.version}
 omod.stockmanagement=${stockmanagement.version}
 omod.billing=${billing.version}
+content.referenceapplication=1.0.0-SNAPSHOT
diff --git a/distro/pom.xml b/distro/pom.xml
index d38e6d74e..25220cd3f 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -285,7 +285,7 @@
             <phase>package</phase>
             <configuration>
               <target>
-                <copy todir="${project.build.directory}/openmrs_config">
+                <copy todir="${project.build.directory}/sdk-distro/web/openmrs_config">
                   <fileset dir="${project.basedir}/configuration"/>
                 </copy>
               </target>
@@ -329,10 +329,13 @@
             <executions>
               <execution>
                 <id>validate-configurations</id>
-                <phase>validate</phase>
+                <phase>verify</phase>
                 <goals>
                   <goal>validate-configurations</goal>
                 </goals>
+                <configuration>
+                  <sourceDir>${project.build.directory}/sdk-distro/web/openmrs_config</sourceDir>
+                </configuration>
               </execution>
             </executions>
           </plugin>
diff --git a/pom.xml b/pom.xml
index 9bd29d4e8..aa3e5400c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,8 @@
         <plugin>
           <groupId>org.openmrs.maven.plugins</groupId>
           <artifactId>openmrs-sdk-maven-plugin</artifactId>
-          <version>5.15.0</version>
+          <version>6.1.0-SNAPSHOT</version>
+
         </plugin>
         <plugin>
           <groupId>org.openmrs.maven.plugins</groupId>