diff --git a/distro/pom.xml b/distro/pom.xml
index e2b1a0bf1..4c5de2e2d 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -2,12 +2,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openmrs.distro</groupId>
-    <artifactId>referenceapplication</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <groupId>org.openmrs</groupId>
+    <artifactId>distro-emr</artifactId>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>referenceapplication-distro</artifactId>
+  <artifactId>distro-emr-configuration</artifactId>
   <name>OpenMRS distro</name>
   <packaging>pom</packaging>
 
@@ -24,9 +24,9 @@
     <!-- track module versions
          we do so here so that we can utilise Maven to track updates, etc. -->
     <fhir2.version>2.0.0</fhir2.version>
-    <openmrs.version>2.6.7-SNAPSHOT</openmrs.version>
-    <initializer.version>2.7.0-SNAPSHOT</initializer.version>
-    <webservices.rest.version>2.45.0-SNAPSHOT</webservices.rest.version>
+    <openmrs.version>2.6.7</openmrs.version>
+    <initializer.version>2.7.0</initializer.version>
+    <webservices.rest.version>2.44.0</webservices.rest.version>
     <addresshierarchy.version>2.17.0</addresshierarchy.version>
     <idgen.version>4.10.0</idgen.version>
     <legacyui.version>1.16.0</legacyui.version>
@@ -35,8 +35,8 @@
     <openconceptlab.version>2.3.0</openconceptlab.version>
     <attachments.version>3.2.0</attachments.version>
     <referencedemodata.version>2.4.0</referencedemodata.version>
-    <queue.version>2.4.0-SNAPSHOT</queue.version>
-    <appointments.version>2.0.0-SNAPSHOT</appointments.version>
+    <queue.version>2.4.0</queue.version>
+    <appointments.version>2.0.0-20240305.062514-14</appointments.version>
     <teleconsultation.version>2.0.0-20230831.113926-1</teleconsultation.version>
     <cohort.version>3.7.1</cohort.version>
     <reporting.version>1.26.0</reporting.version>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 3f9daa30a..d6793e377 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -2,12 +2,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openmrs.distro</groupId>
-    <artifactId>referenceapplication</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <groupId>org.openmrs</groupId>
+    <artifactId>distro-emr</artifactId>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>referenceapplication-frontend</artifactId>
+  <artifactId>distro-emr-frontend</artifactId>
   <name>OpenMRS frontend</name>
   <packaging>pom</packaging>
 
diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json
index 1864054c4..9175caafa 100644
--- a/frontend/spa-assemble-config.json
+++ b/frontend/spa-assemble-config.json
@@ -1,40 +1,40 @@
 {
   "frontendModules": {
+    "@openmrs/esm-active-visits-app": "next",
+    "@openmrs/esm-appointments-app": "next",
+    "@openmrs/esm-cohort-builder-app": "next",
     "@openmrs/esm-devtools-app": "next",
-    "@openmrs/esm-implementer-tools-app": "next",
-    "@openmrs/esm-login-app": "next",
-    "@openmrs/esm-primary-navigation-app": "next",
-    "@openmrs/esm-home-app": "next",
+    "@openmrs/esm-dispensing-app": "next",
+    "@openmrs/esm-fast-data-entry-app": "next",
+    "@openmrs/esm-form-builder-app": "next",
     "@openmrs/esm-form-engine-app": "next",
     "@openmrs/esm-generic-patient-widgets-app": "next",
+    "@openmrs/esm-home-app": "next",
+    "@openmrs/esm-implementer-tools-app": "next",
+    "@openmrs/esm-laboratory-app": "next",
+    "@openmrs/esm-login-app": "next",
+    "@openmrs/esm-openconceptlab-app": "next",
     "@openmrs/esm-patient-allergies-app": "next",
     "@openmrs/esm-patient-attachments-app": "next",
     "@openmrs/esm-patient-banner-app": "next",
     "@openmrs/esm-patient-chart-app": "next",
     "@openmrs/esm-patient-conditions-app": "next",
-    "@openmrs/esm-patient-forms-app": "next",
     "@openmrs/esm-patient-flags-app": "next",
+    "@openmrs/esm-patient-forms-app": "next",
     "@openmrs/esm-patient-immunizations-app": "next",
     "@openmrs/esm-patient-labs-app": "next",
+    "@openmrs/esm-patient-list-management-app": "next",
     "@openmrs/esm-patient-lists-app": "next",
     "@openmrs/esm-patient-medications-app": "next",
     "@openmrs/esm-patient-notes-app": "next",
     "@openmrs/esm-patient-orders-app": "next",
     "@openmrs/esm-patient-programs-app": "next",
-    "@openmrs/esm-patient-vitals-app": "next",
-    "@openmrs/esm-active-visits-app": "next",
-    "@openmrs/esm-appointments-app": "next",
-    "@openmrs/esm-service-queues-app": "next",
-    "@openmrs/esm-patient-list-management-app": "next",
     "@openmrs/esm-patient-registration-app": "next",
     "@openmrs/esm-patient-search-app": "next",
-    "@openmrs/esm-openconceptlab-app": "next",
-    "@openmrs/esm-system-admin-app": "next",
-    "@openmrs/esm-dispensing-app": "next",
-    "@openmrs/esm-laboratory-app": "next",
-    "@openmrs/esm-fast-data-entry-app": "next",
-    "@openmrs/esm-cohort-builder-app": "next",
-    "@openmrs/esm-form-builder-app": "next"
+    "@openmrs/esm-patient-vitals-app": "next",
+    "@openmrs/esm-primary-navigation-app": "next",
+    "@openmrs/esm-service-queues-app": "next",
+    "@openmrs/esm-system-admin-app": "next"
   },
   "excludedFrontendModules": []
 }
diff --git a/pom.xml b/pom.xml
index 1c417f2c0..bf6c0eccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openmrs.distro</groupId>
-  <artifactId>referenceapplication</artifactId>
+  <groupId>org.openmrs</groupId>
+  <artifactId>distro-emr</artifactId>
   <name>Package and Run OpenMRS</name>
   <description>Convenient project to build an OpenMRS distribution and run it</description>
 
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <organization>