diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index ff7b4e2dd..afbe7e8ae 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.3
 FROM --platform=$BUILDPLATFORM node:18-alpine as dev
 
-ARG APP_SHELL_VERSION=5.3.2
+ARG APP_SHELL_VERSION=next
 
 RUN mkdir -p /app
 WORKDIR /app
@@ -9,8 +9,8 @@ WORKDIR /app
 COPY spa-build-config.json .
 
 ARG CACHE_BUST
-RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.3.2} assemble --manifest --mode config --config spa-build-config.json --target ./spa
-RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.3.2} 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-build-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
 
 FROM nginx:1.25-alpine
diff --git a/frontend/spa-build-config.json b/frontend/spa-build-config.json
index 1a4a509f2..295c3d747 100644
--- a/frontend/spa-build-config.json
+++ b/frontend/spa-build-config.json
@@ -1,39 +1,39 @@
 {
   "frontendModules": {
-    "@openmrs/esm-devtools-app": "5.3.2",
-    "@openmrs/esm-implementer-tools-app": "5.3.2",
-    "@openmrs/esm-login-app": "5.3.2",
-    "@openmrs/esm-primary-navigation-app": "5.3.2",
-    "@openmrs/esm-home-app": "5.2.0",
-    "@openmrs/esm-form-entry-app": "6.1.0",
-    "@openmrs/esm-generic-patient-widgets-app": "6.1.0",
-    "@openmrs/esm-patient-allergies-app": "6.1.0",
-    "@openmrs/esm-patient-appointments-app": "6.1.0",
-    "@openmrs/esm-patient-attachments-app": "6.1.0",
-    "@openmrs/esm-patient-banner-app": "6.1.0",
-    "@openmrs/esm-patient-chart-app": "6.1.0",
-    "@openmrs/esm-patient-conditions-app": "6.1.0",
-    "@openmrs/esm-patient-forms-app": "6.1.0",
-    "@openmrs/esm-patient-flags-app": "6.1.0",
-    "@openmrs/esm-patient-labs-app": "6.1.0",
-    "@openmrs/esm-patient-lists-app": "6.1.0",
-    "@openmrs/esm-patient-medications-app": "6.1.0",
-    "@openmrs/esm-patient-notes-app": "6.1.0",
-    "@openmrs/esm-patient-orders-app": "6.1.0",
-    "@openmrs/esm-patient-programs-app": "6.1.0",
-    "@openmrs/esm-patient-vitals-app": "6.1.0",
-    "@openmrs/esm-active-visits-app": "5.2.1",
-    "@openmrs/esm-appointments-app": "5.2.1",
-    "@openmrs/esm-service-queues-app": "5.2.1",
-    "@openmrs/esm-patient-list-management-app": "5.2.1",
-    "@openmrs/esm-patient-registration-app": "5.2.1",
-    "@openmrs/esm-patient-search-app": "5.2.1",
-    "@openmrs/esm-openconceptlab-app": "4.0.1",
-    "@openmrs/esm-system-admin-app": "4.0.1",
-    "@openmrs/esm-dispensing-app": "1.2.1",
-    "@openmrs/esm-fast-data-entry-app": "1.0.1-pre.117",
-    "@openmrs/esm-cohort-builder-app": "3.0.1-pre.183",
-    "@openmrs/esm-form-builder-app": "2.2.1"
+    "@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-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"
   },
   "spaPath": "$SPA_PATH",
   "apiUrl": "$API_URL",