diff --git a/angular.json b/angular.json
index ad6a610364ad675a126efa6911199270aceaf588..7671b88cea4e1145f9235c2b4add247a85708a8f 100644
--- a/angular.json
+++ b/angular.json
@@ -57,7 +57,7 @@
               "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": false,
+              "buildOptimizer": true,
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
diff --git a/package.json b/package.json
index acf3026f9b876c1a3b944e74ecf83ce408d4cec6..7365f8997acdf1336592a76acdf13a80b1c93dfe 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
     "mkdocs2pdf": "node scripts/python3.js mkdocs2pdf.py",
     "preprocess": "node scripts/preprocessors.js && npm run mkdocs",
     "start": "npm run preprocess && npm run ng serve -- --host 0.0.0.0 --poll 5000",
-    "build-no-pdf": "npm run preprocess && npm run ng build -- --prod --build-optimizer=false",
-    "build": "npm run preprocess && npm run mkdocs2pdf && npm run ng build -- --prod --build-optimizer=false",
+    "build-no-pdf": "npm run preprocess && npm run ng build -- --prod",
+    "build": "npm run preprocess && npm run mkdocs2pdf && npm run ng build -- --prod",
     "update-dist-index-mimetypes": "node scripts/update-dist-index-mimetypes.js",
     "build-cordova": "npm run build-no-pdf && npm run update-dist-index-mimetypes && node scripts/add-cordova-script.js",
     "release-android": "npm run build-cordova && \"node_modules/.bin/cordova\" platform add android; node scripts/remove-duplicate-sitemap.js && \"node_modules/.bin/cordova\" build android && node scripts/move-cordova-release.js",