diff --git a/.github/workflows/e2e-on-release.yml b/.github/workflows/e2e-on-release.yml
index 9858e51a1..dd21ec912 100644
--- a/.github/workflows/e2e-on-release.yml
+++ b/.github/workflows/e2e-on-release.yml
@@ -28,7 +28,7 @@ jobs:
         run: bash e2e_test_support_files/extract_tag_numbers.sh
 
       - name: Build and Run Containers
-        run: docker-compose -f e2e_test_support_files/docker-compose-build.yml up -d
+        run: docker compose -f e2e_test_support_files/docker-compose-build.yml up -d
 
       - name: Wait for the backend to start
         run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost/openmrs/login.htm)" != "200" ]]; do sleep 10; done
@@ -66,7 +66,7 @@ jobs:
           docker image ls -a
 
       - name: Spin up an OpenMRS Instance
-        run: docker-compose up -d
+        run: docker compose up -d
         working-directory: e2e_test_support_files
 
       - name: Checkout to the Repo's Tag
@@ -127,7 +127,7 @@ jobs:
           docker image ls -a
 
       - name: Spin up an OpenMRS Instance
-        run: docker-compose up -d
+        run: docker compose up -d
         working-directory: e2e_test_support_files
 
       - name: Checkout to the Repo's Tag
@@ -188,7 +188,7 @@ jobs:
           docker image ls -a
 
       - name: Spin up an OpenMRS Instance
-        run: docker-compose up -d
+        run: docker compose up -d
         working-directory: e2e_test_support_files
 
       - name: Checkout to the Repo's Tag
@@ -249,7 +249,7 @@ jobs:
           docker image ls -a
 
       - name: Spin up an OpenMRS Instance
-        run: docker-compose up -d
+        run: docker compose up -d
         working-directory: e2e_test_support_files
 
       - name: Checkout to the Repo's Tag
@@ -310,7 +310,7 @@ jobs:
           docker image ls -a
 
       - name: Spin up an OpenMRS Instance
-        run: docker-compose up -d
+        run: docker compose up -d
         working-directory: e2e_test_support_files
 
       - name: Checkout to the Repo's Tag
diff --git a/.github/workflows/e2e-tests-on-commit.yml b/.github/workflows/e2e-tests-on-commit.yml
index d8fc24a8e..fb4b57ac8 100644
--- a/.github/workflows/e2e-tests-on-commit.yml
+++ b/.github/workflows/e2e-tests-on-commit.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build and Run Containers
-        run: docker-compose -f e2e_test_support_files/docker-compose-build.yml up -d
+        run: docker compose -f e2e_test_support_files/docker-compose-build.yml up -d
 
       - name: Wait for the backend to start
         run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost/openmrs/login.htm)" != "200" ]]; do sleep 10; done
@@ -52,7 +52,7 @@ jobs:
           docker image ls -a
 
       - name: Spin up an OpenMRS Instance
-        run: docker-compose up -d
+        run: docker compose up -d
         working-directory: e2e_test_support_files
 
       - name: Checkout to the repo's main branch
@@ -113,7 +113,7 @@ jobs:
           docker image ls -a
 
       - name: Spin up an OpenMRS Instance
-        run: docker-compose up -d
+        run: docker compose up -d
         working-directory: e2e_test_support_files
 
       - name: Checkout to the repo's main branch
@@ -174,7 +174,7 @@ jobs:
           docker image ls -a
 
       - name: Spin up an OpenMRS Instance
-        run: docker-compose up -d
+        run: docker compose up -d
         working-directory: e2e_test_support_files
 
       - name: Checkout to the repo's main branch
@@ -235,7 +235,7 @@ jobs:
           docker image ls -a
 
       - name: Spin up an OpenMRS Instance
-        run: docker-compose up -d
+        run: docker compose up -d
         working-directory: e2e_test_support_files
 
       - name: Checkout to the repo's main branch
@@ -296,7 +296,7 @@ jobs:
           docker image ls -a
 
       - name: Spin up an OpenMRS Instance
-        run: docker-compose up -d
+        run: docker compose up -d
         working-directory: e2e_test_support_files
 
       - name: Checkout to the repo's main branch
diff --git a/distro/configuration/ocl/openmrs_SOAP_vSOAP_Note_autoexpand-SOAP_Note.2024-07-27_070529.zip b/distro/configuration/ocl/openmrs_SOAP_vSOAP_Note_autoexpand-SOAP_Note.2024-07-27_070529.zip
new file mode 100644
index 000000000..b859ac081
Binary files /dev/null and b/distro/configuration/ocl/openmrs_SOAP_vSOAP_Note_autoexpand-SOAP_Note.2024-07-27_070529.zip differ
diff --git a/distro/configuration/ocl/openmrs_SOAP_vStructured-SOAP_autoexpand-Structured-SOAP.2024-05-24_131223.zip b/distro/configuration/ocl/openmrs_SOAP_vStructured-SOAP_autoexpand-Structured-SOAP.2024-05-24_131223.zip
deleted file mode 100644
index 704d9bebf..000000000
Binary files a/distro/configuration/ocl/openmrs_SOAP_vStructured-SOAP_autoexpand-Structured-SOAP.2024-05-24_131223.zip and /dev/null differ
diff --git a/distro/pom.xml b/distro/pom.xml
index 7de3a8dd1..08dbfcb63 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openmrs</groupId>
     <artifactId>distro-emr</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>distro-emr-configuration</artifactId>
@@ -27,7 +27,7 @@
     <authentication.version>1.0.0</authentication.version>
     <openmrs.version>2.6.7</openmrs.version>
     <initializer.version>2.7.0</initializer.version>
-    <webservices.rest.version>2.44.0</webservices.rest.version>
+    <webservices.rest.version>2.45.0-SNAPSHOT</webservices.rest.version>
     <addresshierarchy.version>2.17.0</addresshierarchy.version>
     <idgen.version>4.10.0</idgen.version>
     <legacyui.version>1.16.0</legacyui.version>
@@ -48,7 +48,7 @@
     <serialization-xstream.version>0.2.16</serialization-xstream.version>
     <ordertemplates.version>1.0.2</ordertemplates.version>
     <patientflags.version>3.0.7</patientflags.version>
-    <o3forms.version>2.3.0-SNAPSHOT</o3forms.version>
+    <o3forms.version>2.3.0</o3forms.version>
   </properties>
 
   <dependencies>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 6c1d488bc..dfc8ed28b 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openmrs</groupId>
     <artifactId>distro-emr</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>distro-emr-frontend</artifactId>
diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json
index c0282fad0..9bcbe87c0 100644
--- a/frontend/spa-assemble-config.json
+++ b/frontend/spa-assemble-config.json
@@ -36,6 +36,7 @@
     "@openmrs/esm-primary-navigation-app": "next",
     "@openmrs/esm-service-queues-app": "next",
     "@openmrs/esm-system-admin-app": "next",
+    "@openmrs/esm-user-onboarding-app": "next",
     "@ohri/openmrs-esm-ohri-hiv-care-treatment-app": "next",
     "@ohri/openmrs-esm-ohri-core-app": "next"
   },
diff --git a/pom.xml b/pom.xml
index d92e42263..bda63aa38 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.2.0-SNAPSHOT</version>
+  <version>3.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <organization>