diff --git a/.vscode/launch.json b/.vscode/launch.json
index 298b4bdd873..efae4ad6678 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -29,6 +29,15 @@
       "vmArgs": "-Dspring.config.additional-location=file:with-postgres/application.yaml",
       "cwd": "${workspaceFolder}/matchbox-server"
     },
+    {
+      "type": "java",
+      "name": "Launch Matchbox-Server (preload)",
+      "request": "launch",
+      "mainClass": "ca.uhn.fhir.jpa.starter.Application",
+      "projectName": "matchbox-server",
+      "vmArgs": "-Dspring.config.additional-location=file:with-preload/application.yaml",
+      "cwd": "${workspaceFolder}/matchbox-server"
+    },
     {
       "type": "java",
       "name": "Launch Matchbox-Server",
diff --git a/matchbox-engine/pom.xml b/matchbox-engine/pom.xml
index ca4449c3b0c..43cf12f111d 100644
--- a/matchbox-engine/pom.xml
+++ b/matchbox-engine/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>matchbox</artifactId>
         <groupId>health.matchbox</groupId>
-        <version>3.4.2</version>
+        <version>3.4.3</version>
     </parent>
 
     <artifactId>matchbox-engine</artifactId>
diff --git a/matchbox-frontend/Dockerfile b/matchbox-frontend/Dockerfile
deleted file mode 100644
index 9729fbbb3b2..00000000000
--- a/matchbox-frontend/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nginx:latest
-COPY ./default.conf /etc/nginx/templates/default.conf.template
-COPY ./dist /usr/share/nginx/html
diff --git a/matchbox-frontend/README.md b/matchbox-frontend/README.md
index 4413d806490..9e3c32c0a49 100644
--- a/matchbox-frontend/README.md
+++ b/matchbox-frontend/README.md
@@ -50,7 +50,7 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 this angular app is directly provided with matchbox
 
 ```
-ng build --configuration production --base-href /matchboxv3/
+ng build --configuration production
 rm -rf ../matchbox-server/src/main/resources/static/*
 cp -r dist/* ../matchbox-server/src/main/resources/static
 ```
diff --git a/matchbox-frontend/default.conf b/matchbox-frontend/default.conf
deleted file mode 100644
index e290e57c767..00000000000
--- a/matchbox-frontend/default.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-server { 
- listen 80;
- root /usr/share/nginx/html;
- client_max_body_size 100m;
-
- location = / {
-      return 301 ${DOMAIN}/matchbox-formfiller;
- }
-
- location /matchbox-formfiller {
-   alias /usr/share/nginx/html;
-   try_files $uri /index.html;
- }
- 
- location /matchbox {
-   proxy_set_header X-Real-IP $remote_addr;
-   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-   proxy_set_header X-NginX-Proxy true;
-   proxy_pass ${MATCHBOX};
-   proxy_ssl_session_reuse off;
-   proxy_set_header Host $http_host;
-   proxy_cache_bypass $http_upgrade;
-   proxy_redirect off;
- }
-
- location /mag-pmp {
-   proxy_set_header X-Real-IP $remote_addr;
-   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-   proxy_set_header X-NginX-Proxy true;
-   proxy_pass ${MAG};
-   proxy_ssl_session_reuse off;
-   proxy_set_header Host $http_host;
-   proxy_cache_bypass $http_upgrade;
-   proxy_redirect off;
- }
-}
diff --git a/matchbox-frontend/docker-entrypoint.sh b/matchbox-frontend/docker-entrypoint.sh
deleted file mode 100644
index 3333872f1b5..00000000000
--- a/matchbox-frontend/docker-entrypoint.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-envsubst '${MAG} ${MATCHBOX} ${DOMAIN}' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
-
-exec "$@"
diff --git a/matchbox-frontend/package-lock.json b/matchbox-frontend/package-lock.json
index 598e5fed62c..b2d8cd0a89b 100644
--- a/matchbox-frontend/package-lock.json
+++ b/matchbox-frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "matchboxv3",
-  "version": "3.3.0",
+  "version": "3.4.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matchboxv3",
-      "version": "3.3.0",
+      "version": "3.4.2",
       "license": "MIT",
       "dependencies": {
         "@angular-devkit/build-angular": "^16.1.4",
diff --git a/matchbox-frontend/package.json b/matchbox-frontend/package.json
index fd01f85210f..98a3132de03 100644
--- a/matchbox-frontend/package.json
+++ b/matchbox-frontend/package.json
@@ -1,12 +1,12 @@
 {
   "name": "matchboxv3",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build --configuration production --base-href /matchboxv3/",
-    "build-matchbox": "ng build --configuration production --base-href /matchboxv3/ --output-path ../matchbox-server/src/main/resources/static",
+    "build": "ng build --configuration production",
+    "build-matchbox": "ng build --configuration production --output-path ../matchbox-server/src/main/resources/static",
     "test": "ng test",
     "test-ci": "ng test --no-watch --no-progress --browsers=ChromeHeadlessNoSandbox --code-coverage",
     "lint": "ng lint",
diff --git a/matchbox-server/pom.xml b/matchbox-server/pom.xml
index f4a759b43a5..59619c4d98f 100644
--- a/matchbox-server/pom.xml
+++ b/matchbox-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matchbox</artifactId>
         <groupId>health.matchbox</groupId>
-        <version>3.4.2</version>
+        <version>3.4.3</version>
     </parent>
 
     <artifactId>matchbox-server</artifactId>
diff --git a/pom.xml b/pom.xml
index 59900fe1e94..b7dfb9e6646 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>health.matchbox</groupId>
     <artifactId>matchbox</artifactId>
-    <version>3.4.2</version>
+    <version>3.4.3</version>
     <packaging>pom</packaging>
     <name>matchbox</name>
     <description>An open-source implementation to support testing and implementation of FHIR based solutions and map or