diff --git a/package-lock.json b/package-lock.json
index b694fda607e..333a71a0ef6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13446,27 +13446,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/encoding": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "optional": true,
-      "dependencies": {
-        "iconv-lite": "^0.6.2"
-      }
-    },
-    "node_modules/encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "optional": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
diff --git a/package.json b/package.json
index c07a955cbc2..ad40c47b8b9 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,8 @@
     "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build --configuration development",
     "build:stats": "ng build --stats-json",
+    "build:dspace": "node --max-old-space-size=8192 ./node_modules/.bin/ng build --configuration production",
+    "build:prod": "node --max-old-space-size=8192 node_modules/@angular/cli/bin/ng build --configuration production",
     "build:prod": "cross-env NODE_ENV=production npm run build:ssr",
     "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
     "build:lint": "rimraf --glob 'lint/dist/**/*.js' 'lint/dist/**/*.js.map' && tsc -b lint/tsconfig.json",
@@ -34,6 +36,7 @@
     "clean:log": "rimraf --glob *.log*",
     "clean:json": "rimraf --glob *.records.json",
     "clean:node": "rimraf node_modules",
+     "build:ssr:staged": "node --max-old-space-size=8192 ng build --configuration production && node --max-old-space-size=8192 ng run dspace-angular:server:production",
     "clean:cli": "rimraf .angular/cache",
     "clean:prod": "npm run clean:dist && npm run clean:log && npm run clean:doc && npm run clean:coverage && npm run clean:json",
     "clean": "npm run clean:prod && npm run clean:dev:config && npm run clean:cli && npm run clean:node",
diff --git a/tsconfig.json b/tsconfig.json
index 013a1e47937..f9a67a320a6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -55,10 +55,19 @@
       // The categories to use for specific diagnostics.
       "checks": {
         "missingControlFlowDirective": "error"
-      },
+      }
     }
   },
   "exclude": [
     "cypress.config.ts"
   ],
+  "include": [
+    "src/main/webapp/**/*.ts",
+    "src/main/webapp/**/*.html",
+    "!src/themes/custom/**/*.ts"  // Exclude custom theme files
+  ],
+  "exclude": [
+    "node_modules",
+    "src/themes/custom/**/*"
+  ]
 }