diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 76339d426..28f6b50a6 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 validator clean package
+        run: mvn --batch-mode --update-snapshots --activate-profiles distro,validator clean package
diff --git a/distro/pom.xml b/distro/pom.xml
index 35f1690a0..a9fceffa2 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openmrs.distro</groupId>
     <artifactId>referenceapplication</artifactId>
-    <version>3.0.0-beta.17</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>referenceapplication-distro</artifactId>
@@ -24,7 +24,7 @@
     <!-- track module versions
          we do so here so that we can utilise Maven to track updates, etc. -->
     <fhir2.version>1.10.0</fhir2.version>
-    <openmrs.version>2.6.4</openmrs.version>
+    <openmrs.version>2.6.4-SNAPSHOT</openmrs.version>
     <initializer.version>2.6.0</initializer.version>
     <webservices.rest.version>2.41.0</webservices.rest.version>
     <addresshierarchy.version>2.17.0</addresshierarchy.version>
@@ -35,9 +35,9 @@
     <openconceptlab.version>2.1.0</openconceptlab.version>
     <!-- this is request for the OCL UI -->
     <owa.version>1.14.0</owa.version>
-    <attachments.version>3.1.0</attachments.version>
+    <attachments.version>3.1.0-SNAPSHOT</attachments.version>
     <referencedemodata.version>2.4.0</referencedemodata.version>
-    <queue.version>2.2.1</queue.version>
+    <queue.version>2.1.0-SNAPSHOT</queue.version>
     <appointments.version>2.0.0-20231101.130425-7</appointments.version>
     <teleconsultation.version>2.0.0-20230831.113926-1</teleconsultation.version>
     <cohort.version>3.6.0</cohort.version>
diff --git a/e2e_test_support_files/extract_tag_numbers.sh b/e2e_test_support_files/extract_tag_numbers.sh
index 0f1c20c06..4f5f98ead 100644
--- a/e2e_test_support_files/extract_tag_numbers.sh
+++ b/e2e_test_support_files/extract_tag_numbers.sh
@@ -17,7 +17,7 @@ get_repository_tag() {
   echo "$repo_name=$ref"
 }
 
-file_path="frontend/spa-assemble-config.json""
+file_path="frontend/spa-assemble-config.json"
 
 # Call the function for each Repository with the app as the second argument
 get_repository_tag "$file_path" "patient_management" "@openmrs/esm-patient-registration-app" >> "$GITHUB_OUTPUT"
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index b350c333a..1cff5ca95 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -4,7 +4,7 @@
 #--------------------------------------------
 FROM --platform=$BUILDPLATFORM node:18-alpine as dev
 
-ARG APP_SHELL_VERSION=5.4.0
+ARG APP_SHELL_VERSION=next
 
 RUN mkdir -p /app
 WORKDIR /app
@@ -13,8 +13,8 @@ COPY spa-assemble-config.json .
 COPY spa-build-config.json .
 
 ARG CACHE_BUST
-RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.4.0} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa
-RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.4.0} build --build-config spa-build-config.json --target ./spa
+RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa
+RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} build --build-config spa-build-config.json --target ./spa
 RUN if [ ! -f ./spa/index.html ]; then echo 'Build failed. Please check the logs above for details. This may have happened because of an update to a library that OpenMRS depends on.'; exit 1; fi
 
 #--------------------------------------------
diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json
index 4dc5fef02..aebf581da 100644
--- a/frontend/spa-assemble-config.json
+++ b/frontend/spa-assemble-config.json
@@ -1,40 +1,40 @@
 {
   "frontendModules": {
-    "@openmrs/esm-devtools-app": "5.4.0",
-    "@openmrs/esm-implementer-tools-app": "5.4.0",
-    "@openmrs/esm-login-app": "5.4.0",
-    "@openmrs/esm-primary-navigation-app": "5.4.0",
-    "@openmrs/esm-home-app": "5.2.2",
-    "@openmrs/esm-form-entry-app": "7.0.1",
-    "@openmrs/esm-generic-patient-widgets-app": "7.0.1",
-    "@openmrs/esm-patient-allergies-app": "7.0.1",
-    "@openmrs/esm-patient-appointments-app": "7.0.1",
-    "@openmrs/esm-patient-attachments-app": "7.0.1",
-    "@openmrs/esm-patient-banner-app": "7.0.1",
-    "@openmrs/esm-patient-chart-app": "7.0.1",
-    "@openmrs/esm-patient-conditions-app": "7.0.1",
-    "@openmrs/esm-patient-forms-app": "7.0.1",
-    "@openmrs/esm-patient-flags-app": "7.0.1",
-    "@openmrs/esm-patient-immunizations-app": "7.0.1",
-    "@openmrs/esm-patient-labs-app": "7.0.1",
-    "@openmrs/esm-patient-lists-app": "7.0.1",
-    "@openmrs/esm-patient-medications-app": "7.0.1",
-    "@openmrs/esm-patient-notes-app": "7.0.1",
-    "@openmrs/esm-patient-orders-app": "7.0.1",
-    "@openmrs/esm-patient-programs-app": "7.0.1",
-    "@openmrs/esm-patient-vitals-app": "7.0.1",
-    "@openmrs/esm-active-visits-app": "6.0.0",
-    "@openmrs/esm-appointments-app": "6.0.0",
-    "@openmrs/esm-service-queues-app": "6.0.0",
-    "@openmrs/esm-patient-list-management-app": "6.0.0",
-    "@openmrs/esm-patient-registration-app": "6.0.0",
-    "@openmrs/esm-patient-search-app": "6.0.0",
-    "@openmrs/esm-openconceptlab-app": "4.0.1",
-    "@openmrs/esm-system-admin-app": "4.0.1",
-    "@openmrs/esm-dispensing-app": "1.3.0",
-    "@openmrs/esm-fast-data-entry-app": "1.0.1-pre.128",
-    "@openmrs/esm-cohort-builder-app": "3.0.1-pre.183",
-    "@openmrs/esm-form-builder-app": "2.3.1-pre.677"
+    "@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-form-entry-app": "next",
+    "@openmrs/esm-generic-patient-widgets-app": "next",
+    "@openmrs/esm-patient-allergies-app": "next",
+    "@openmrs/esm-patient-appointments-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-immunizations-app": "next",
+    "@openmrs/esm-patient-labs-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-fast-data-entry-app": "next",
+    "@openmrs/esm-cohort-builder-app": "next",
+    "@openmrs/esm-form-builder-app": "next"
   },
   "excludedFrontendModules": []
 }
diff --git a/pom.xml b/pom.xml
index 062daf210..1c417f2c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <name>Package and Run OpenMRS</name>
   <description>Convenient project to build an OpenMRS distribution and run it</description>
 
-  <version>3.0.0-beta.17</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <organization>