diff --git a/.github/workflows/lighthouse-ci.yml b/.github/workflows/lighthouse-ci.yml
index 9477957f5..f02bf4e32 100644
--- a/.github/workflows/lighthouse-ci.yml
+++ b/.github/workflows/lighthouse-ci.yml
@@ -28,8 +28,8 @@ jobs:
 
       - run: npm run env # Generate env.generated.ts
 
-      - name: Build production web app (no service worker)
-        run: npm run buildFrontend:prodWeb:no-sw
+      - name: Build production web app
+        run: npm run buildFrontend:prodWeb
 
       - name: Run Lighthouse CI
         uses: treosh/lighthouse-ci-action@v12
@@ -40,4 +40,4 @@ jobs:
           uploadArtifacts: true
           temporaryPublicStorage: true
           # Run 3 times for consistency
-          runs: 1
+          runs: 3
diff --git a/angular.json b/angular.json
index f025eb13c..34b6633f9 100644
--- a/angular.json
+++ b/angular.json
@@ -120,38 +120,6 @@
               "extractLicenses": true,
               "serviceWorker": "ngsw-config.json"
             },
-            "productionWebNoSw": {
-              "outputPath": {
-                "base": "dist",
-                "browser": "browser"
-              },
-              "budgets": [
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "20kb"
-                }
-              ],
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": {
-                "scripts": true,
-                "styles": {
-                  "minify": true,
-                  "inlineCritical": true
-                },
-                "fonts": true
-              },
-              "outputHashing": "all",
-              "sourceMap": true,
-              "namedChunks": false,
-              "aot": true,
-              "extractLicenses": true,
-              "serviceWorker": false
-            },
             "stage": {
               "baseHref": "",
               "budgets": [
diff --git a/package.json b/package.json
index 60574d301..6e3a16f2c 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,6 @@
     "buildFrontend:prod:es6": "npm run prebuild && cross-env BROWSERSLIST_ENV='modern' ng build --configuration production && npm run removeWOFF1",
     "buildFrontend:prod:watch": "npm run prebuild && ng build --configuration production --watch",
     "buildFrontend:prodWeb": "npm run prebuild && ng build  --configuration productionWeb",
-    "buildFrontend:prodWeb:no-sw": "npm run prebuild && ng build --configuration productionWebNoSw",
     "buildFrontend:stage:es6": "npm run prebuild && cross-env BROWSERSLIST_ENV='modern' ng build --configuration stage && npm run removeWOFF1",
     "buildFrontend:stageWeb": "npm run prebuild && ng build --configuration stageWeb",
     "buildFrontend:stageWeb:unminified": "npm run prebuild && ng build --configuration stageWeb --optimization=false --aot=false",
diff --git a/tools/lighthouse/.lighthouserc.json b/tools/lighthouse/.lighthouserc.json
index 1f98494fe..fdf4de027 100644
--- a/tools/lighthouse/.lighthouserc.json
+++ b/tools/lighthouse/.lighthouserc.json
@@ -2,7 +2,7 @@
   "ci": {
     "collect": {
       "staticDistDir": "./dist",
-      "numberOfRuns": 1,
+      "numberOfRuns": 3,
       "settings": {
         "chromeFlags": "--no-sandbox --disable-dev-shm-usage",
         "maxWaitForLoad": 120000,