diff --git a/Dockerfile b/Dockerfile
index 4f7efd3ed..031dc280b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,6 +22,6 @@ RUN npm install && rm -rf /root/.npm
 RUN npx gulp
 
 # Provide a Healthcheck command for easier use in CI.
-HEALTHCHECK --interval=10s --timeout=3s --start-period=30s CMD curl -f http://localhost:8100 || exit 1
+HEALTHCHECK --interval=10s --timeout=5s --start-period=60s CMD curl -f http://localhost:8100 || exit 1
 
 CMD ["npm", "run", "ionic:serve"]
diff --git a/angular.json b/angular.json
index c44eabc41..2b8ec418d 100644
--- a/angular.json
+++ b/angular.json
@@ -68,7 +68,8 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "app:build"
+            "browserTarget": "app:build",
+            "port": 8100
           },
           "configurations": {
             "production": {
diff --git a/package.json b/package.json
index 39c44d1d2..a98696dbe 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "test:coverage": "NODE_ENV=testing gulp && jest --coverage",
     "lint": "NODE_OPTIONS=--max-old-space-size=4096 ng lint",
     "ionic:serve:before": "gulp",
-    "ionic:serve": "gulp watch & ng serve",
+    "ionic:serve": "gulp watch & NODE_OPTIONS=--max-old-space-size=4096 ng serve",
     "ionic:build:before": "gulp"
   },
   "dependencies": {