diff --git a/console-webapp/angular.json b/console-webapp/angular.json
index ca1d327b3..d67130a8c 100644
--- a/console-webapp/angular.json
+++ b/console-webapp/angular.json
@@ -61,6 +61,14 @@
                   "with": "src/environments/environment.prod.ts"
                 }
               ],
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              },
               "outputHashing": "all"
             },
             "sandbox": {
diff --git a/jetty/src/main/jetty-base/webapps/console/WEB-INF/web.xml b/jetty/src/main/jetty-base/webapps/console/WEB-INF/web.xml
index 2e85fae97..f757cb05c 100644
--- a/jetty/src/main/jetty-base/webapps/console/WEB-INF/web.xml
+++ b/jetty/src/main/jetty-base/webapps/console/WEB-INF/web.xml
@@ -9,8 +9,8 @@
             <init-param>
                 <param-name>headerConfig</param-name>
                 <param-value>
-                    set Content-Security-Policy: default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; object-src 'none'; base-uri 'self';
-                    set X-Content-Type-Options: nosniff
+                    set Content-Security-Policy: default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; object-src 'none'; base-uri 'self';,
+                    set X-Content-Type-Options: nosniff,
                     set X-Frame-Options: DENY
                 </param-value>
             </init-param>