diff --git a/.eslintrc.json b/.eslintrc.json
index 53d4f236..74157829 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -2,6 +2,7 @@
   "root": true,
   "ignorePatterns": ["**/*"],
   "plugins": ["@nx"],
+  "extends": ["@code-pushup"],
   "settings": {
     "import/resolver": {
       "typescript": {
@@ -9,6 +10,5 @@
         "project": "tsconfig.base.json"
       }
     }
-  },
-  "extends": ["@code-pushup"]
+  }
 }
diff --git a/package-lock.json b/package-lock.json
index 870d6db9..aa2f4a01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.0",
       "license": "MIT",
       "dependencies": {
-        "@code-pushup/portal-client": "^0.4.1",
+        "@code-pushup/portal-client": "^0.6.1",
         "@puppeteer/replay": "^1.3.1",
         "@types/concurrently": "^7.0.0",
         "@types/puppeteer": "^5.4.7",
@@ -29,9 +29,9 @@
         "zod": "^3.22.4"
       },
       "devDependencies": {
-        "@code-pushup/cli": "^0.22.0",
-        "@code-pushup/eslint-config": "^0.4.0",
-        "@code-pushup/eslint-plugin": "^0.22.1",
+        "@code-pushup/cli": "^0.25.6",
+        "@code-pushup/eslint-config": "^0.5.0",
+        "@code-pushup/eslint-plugin": "^0.25.6",
         "@commitlint/cli": "^17.2.0",
         "@commitlint/config-angular": "^17.2.0",
         "@jscutlery/semver": "^4.0.0",
@@ -2122,9 +2122,9 @@
       "dev": true
     },
     "node_modules/@code-pushup/cli": {
-      "version": "0.22.8",
-      "resolved": "https://registry.npmjs.org/@code-pushup/cli/-/cli-0.22.8.tgz",
-      "integrity": "sha512-EpNY0NAfSKoqUTMNcoZ3sGpmFnCH2E+BLLY9RmmTnrz/t09NGGPpJIL+R4k1UeTqjZZDXhHcwc8fvR5LzVdz6Q==",
+      "version": "0.25.6",
+      "resolved": "https://registry.npmjs.org/@code-pushup/cli/-/cli-0.25.6.tgz",
+      "integrity": "sha512-yO0TPO9HJCIBF7OCJTMikgEWaMaou6+/pwdyYBBmUX49sKa6ns/2TwdMSj5emtdkZIy9STxYBMopE8poN1DcMw==",
       "dev": true,
       "dependencies": {
         "@code-pushup/core": "*",
@@ -2162,6 +2162,17 @@
         "chalk": "^5.3.0"
       }
     },
+    "node_modules/@code-pushup/core/node_modules/@code-pushup/portal-client": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@code-pushup/portal-client/-/portal-client-0.4.1.tgz",
+      "integrity": "sha512-6wZBhtugLTYNeG+gvRtB0ggSo8zH5gpZzAXk/OhQ3SQ8ayIc1ws5zuGzD6EU1H67CCYRNldCmBEzJ4qBVj05fg==",
+      "dev": true,
+      "dependencies": {
+        "graphql": "^16.6.0",
+        "graphql-request": "^6.1.0",
+        "graphql-tag": "^2.12.6"
+      }
+    },
     "node_modules/@code-pushup/core/node_modules/chalk": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
@@ -2175,9 +2186,9 @@
       }
     },
     "node_modules/@code-pushup/eslint-config": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@code-pushup/eslint-config/-/eslint-config-0.4.0.tgz",
-      "integrity": "sha512-si3YQa7a+04QdS0kODjAQOx7gIgzNbMVAy4V4vkS1RTwGpCaXVZg0wsU935AGfkZ/XiTfmh8UvJEi3C+/NXCgQ==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@code-pushup/eslint-config/-/eslint-config-0.5.0.tgz",
+      "integrity": "sha512-RpXiPh27aZUthtgeQK0MvG247a7Tt81Iqd+ACoeGD3TfB/drwxZJxsvapBqEdf2+xe7zwtbSiWzoeQ5Z0kxXUg==",
       "dev": true,
       "peerDependencies": {
         "@angular-eslint/eslint-plugin": "^17.0.0",
@@ -2245,9 +2256,9 @@
       }
     },
     "node_modules/@code-pushup/eslint-plugin": {
-      "version": "0.22.8",
-      "resolved": "https://registry.npmjs.org/@code-pushup/eslint-plugin/-/eslint-plugin-0.22.8.tgz",
-      "integrity": "sha512-ir0gYRrksJ83HJK5N61Vdg427OHmbmCaFl+65kdaxb+pcOoeexwkGPzpAAEiGgkkVS8MTfK7ffe2hQvxcxL3wA==",
+      "version": "0.25.6",
+      "resolved": "https://registry.npmjs.org/@code-pushup/eslint-plugin/-/eslint-plugin-0.25.6.tgz",
+      "integrity": "sha512-FHU9fOUXfsBDbEAKlns9WVCRYtWsy43Uf4mgPKjEDbFR0dzbjc80NxYA1cwDOA88g49sVeUrGhlFmWLZtPuP0w==",
       "dev": true,
       "dependencies": {
         "@code-pushup/models": "*",
@@ -2422,16 +2433,28 @@
         "zod": "^3.22.1"
       }
     },
-    "node_modules/@code-pushup/portal-client": {
+    "node_modules/@code-pushup/models/node_modules/@code-pushup/portal-client": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@code-pushup/portal-client/-/portal-client-0.4.1.tgz",
       "integrity": "sha512-6wZBhtugLTYNeG+gvRtB0ggSo8zH5gpZzAXk/OhQ3SQ8ayIc1ws5zuGzD6EU1H67CCYRNldCmBEzJ4qBVj05fg==",
+      "dev": true,
       "dependencies": {
         "graphql": "^16.6.0",
         "graphql-request": "^6.1.0",
         "graphql-tag": "^2.12.6"
       }
     },
+    "node_modules/@code-pushup/portal-client": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@code-pushup/portal-client/-/portal-client-0.6.1.tgz",
+      "integrity": "sha512-2k/1ovNF3bz1n0D+7O2cVUzBy+dOFrdPpuXy7IAsODiVN5h7PCC6daWE1cJC7T/uSxu152U000gU69S93jyIOw==",
+      "dependencies": {
+        "graphql": "^16.6.0",
+        "graphql-request": "^6.1.0",
+        "graphql-tag": "^2.12.6",
+        "vscode-material-icons": "^0.1.0"
+      }
+    },
     "node_modules/@code-pushup/utils": {
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/@code-pushup/utils/-/utils-0.14.1.tgz",
@@ -21093,8 +21116,7 @@
     "node_modules/vscode-material-icons": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/vscode-material-icons/-/vscode-material-icons-0.1.0.tgz",
-      "integrity": "sha512-/fO1x+6JTg6QMB4W8VsIY5vwJEe/vELIg49yGIV2NLDrmLRr2nuyGo/IMMngkxu/ol4s8uQhwHFHTpdoyP6U5g==",
-      "dev": true
+      "integrity": "sha512-/fO1x+6JTg6QMB4W8VsIY5vwJEe/vELIg49yGIV2NLDrmLRr2nuyGo/IMMngkxu/ol4s8uQhwHFHTpdoyP6U5g=="
     },
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
@@ -23157,9 +23179,9 @@
       "dev": true
     },
     "@code-pushup/cli": {
-      "version": "0.22.8",
-      "resolved": "https://registry.npmjs.org/@code-pushup/cli/-/cli-0.22.8.tgz",
-      "integrity": "sha512-EpNY0NAfSKoqUTMNcoZ3sGpmFnCH2E+BLLY9RmmTnrz/t09NGGPpJIL+R4k1UeTqjZZDXhHcwc8fvR5LzVdz6Q==",
+      "version": "0.25.6",
+      "resolved": "https://registry.npmjs.org/@code-pushup/cli/-/cli-0.25.6.tgz",
+      "integrity": "sha512-yO0TPO9HJCIBF7OCJTMikgEWaMaou6+/pwdyYBBmUX49sKa6ns/2TwdMSj5emtdkZIy9STxYBMopE8poN1DcMw==",
       "dev": true,
       "requires": {
         "@code-pushup/core": "*",
@@ -23190,6 +23212,17 @@
         "chalk": "^5.3.0"
       },
       "dependencies": {
+        "@code-pushup/portal-client": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/@code-pushup/portal-client/-/portal-client-0.4.1.tgz",
+          "integrity": "sha512-6wZBhtugLTYNeG+gvRtB0ggSo8zH5gpZzAXk/OhQ3SQ8ayIc1ws5zuGzD6EU1H67CCYRNldCmBEzJ4qBVj05fg==",
+          "dev": true,
+          "requires": {
+            "graphql": "^16.6.0",
+            "graphql-request": "^6.1.0",
+            "graphql-tag": "^2.12.6"
+          }
+        },
         "chalk": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
@@ -23199,16 +23232,16 @@
       }
     },
     "@code-pushup/eslint-config": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@code-pushup/eslint-config/-/eslint-config-0.4.0.tgz",
-      "integrity": "sha512-si3YQa7a+04QdS0kODjAQOx7gIgzNbMVAy4V4vkS1RTwGpCaXVZg0wsU935AGfkZ/XiTfmh8UvJEi3C+/NXCgQ==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@code-pushup/eslint-config/-/eslint-config-0.5.0.tgz",
+      "integrity": "sha512-RpXiPh27aZUthtgeQK0MvG247a7Tt81Iqd+ACoeGD3TfB/drwxZJxsvapBqEdf2+xe7zwtbSiWzoeQ5Z0kxXUg==",
       "dev": true,
       "requires": {}
     },
     "@code-pushup/eslint-plugin": {
-      "version": "0.22.8",
-      "resolved": "https://registry.npmjs.org/@code-pushup/eslint-plugin/-/eslint-plugin-0.22.8.tgz",
-      "integrity": "sha512-ir0gYRrksJ83HJK5N61Vdg427OHmbmCaFl+65kdaxb+pcOoeexwkGPzpAAEiGgkkVS8MTfK7ffe2hQvxcxL3wA==",
+      "version": "0.25.6",
+      "resolved": "https://registry.npmjs.org/@code-pushup/eslint-plugin/-/eslint-plugin-0.25.6.tgz",
+      "integrity": "sha512-FHU9fOUXfsBDbEAKlns9WVCRYtWsy43Uf4mgPKjEDbFR0dzbjc80NxYA1cwDOA88g49sVeUrGhlFmWLZtPuP0w==",
       "dev": true,
       "requires": {
         "@code-pushup/models": "*",
@@ -23336,16 +23369,30 @@
       "requires": {
         "@code-pushup/portal-client": "^0.4.1",
         "zod": "^3.22.1"
+      },
+      "dependencies": {
+        "@code-pushup/portal-client": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/@code-pushup/portal-client/-/portal-client-0.4.1.tgz",
+          "integrity": "sha512-6wZBhtugLTYNeG+gvRtB0ggSo8zH5gpZzAXk/OhQ3SQ8ayIc1ws5zuGzD6EU1H67CCYRNldCmBEzJ4qBVj05fg==",
+          "dev": true,
+          "requires": {
+            "graphql": "^16.6.0",
+            "graphql-request": "^6.1.0",
+            "graphql-tag": "^2.12.6"
+          }
+        }
       }
     },
     "@code-pushup/portal-client": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@code-pushup/portal-client/-/portal-client-0.4.1.tgz",
-      "integrity": "sha512-6wZBhtugLTYNeG+gvRtB0ggSo8zH5gpZzAXk/OhQ3SQ8ayIc1ws5zuGzD6EU1H67CCYRNldCmBEzJ4qBVj05fg==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@code-pushup/portal-client/-/portal-client-0.6.1.tgz",
+      "integrity": "sha512-2k/1ovNF3bz1n0D+7O2cVUzBy+dOFrdPpuXy7IAsODiVN5h7PCC6daWE1cJC7T/uSxu152U000gU69S93jyIOw==",
       "requires": {
         "graphql": "^16.6.0",
         "graphql-request": "^6.1.0",
-        "graphql-tag": "^2.12.6"
+        "graphql-tag": "^2.12.6",
+        "vscode-material-icons": "^0.1.0"
       }
     },
     "@code-pushup/utils": {
@@ -37128,8 +37175,7 @@
     "vscode-material-icons": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/vscode-material-icons/-/vscode-material-icons-0.1.0.tgz",
-      "integrity": "sha512-/fO1x+6JTg6QMB4W8VsIY5vwJEe/vELIg49yGIV2NLDrmLRr2nuyGo/IMMngkxu/ol4s8uQhwHFHTpdoyP6U5g==",
-      "dev": true
+      "integrity": "sha512-/fO1x+6JTg6QMB4W8VsIY5vwJEe/vELIg49yGIV2NLDrmLRr2nuyGo/IMMngkxu/ol4s8uQhwHFHTpdoyP6U5g=="
     },
     "w3c-xmlserializer": {
       "version": "4.0.0",
diff --git a/package.json b/package.json
index d5ca6a2b..80615169 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@code-pushup/portal-client": "^0.4.1",
+    "@code-pushup/portal-client": "^0.6.1",
     "@puppeteer/replay": "^1.3.1",
     "@types/concurrently": "^7.0.0",
     "@types/puppeteer": "^5.4.7",
@@ -40,9 +40,9 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@code-pushup/cli": "^0.22.0",
-    "@code-pushup/eslint-config": "^0.4.0",
-    "@code-pushup/eslint-plugin": "^0.22.1",
+    "@code-pushup/cli": "^0.25.6",
+    "@code-pushup/eslint-config": "^0.5.0",
+    "@code-pushup/eslint-plugin": "^0.25.6",
     "@commitlint/cli": "^17.2.0",
     "@commitlint/config-angular": "^17.2.0",
     "@jscutlery/semver": "^4.0.0",
diff --git a/packages/cli/.eslintrc.json b/packages/cli/.eslintrc.json
index 8d8146ca..647c8ed3 100644
--- a/packages/cli/.eslintrc.json
+++ b/packages/cli/.eslintrc.json
@@ -1,12 +1,7 @@
 {
   "extends": ["../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx"],
-      "parserOptions": {
-        "project": ["packages/cli/tsconfig.*?.json"]
-      }
-    }
-  ]
+  "parserOptions": {
+    "project": ["packages/cli/tsconfig.*?.json"]
+  }
 }
diff --git a/packages/nx-plugin-integration/.eslintrc.json b/packages/nx-plugin-integration/.eslintrc.json
index 052a5874..647c8ed3 100644
--- a/packages/nx-plugin-integration/.eslintrc.json
+++ b/packages/nx-plugin-integration/.eslintrc.json
@@ -1,4 +1,7 @@
 {
   "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"]
+  "ignorePatterns": ["!**/*"],
+  "parserOptions": {
+    "project": ["packages/cli/tsconfig.*?.json"]
+  }
 }
diff --git a/packages/nx-plugin/.eslintrc.json b/packages/nx-plugin/.eslintrc.json
index 052a5874..647c8ed3 100644
--- a/packages/nx-plugin/.eslintrc.json
+++ b/packages/nx-plugin/.eslintrc.json
@@ -1,4 +1,7 @@
 {
   "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"]
+  "ignorePatterns": ["!**/*"],
+  "parserOptions": {
+    "project": ["packages/cli/tsconfig.*?.json"]
+  }
 }
diff --git a/packages/sandbox/.eslintrc.json b/packages/sandbox/.eslintrc.json
index 052a5874..647c8ed3 100644
--- a/packages/sandbox/.eslintrc.json
+++ b/packages/sandbox/.eslintrc.json
@@ -1,4 +1,7 @@
 {
   "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"]
+  "ignorePatterns": ["!**/*"],
+  "parserOptions": {
+    "project": ["packages/cli/tsconfig.*?.json"]
+  }
 }
diff --git a/packages/test-data/.eslintrc.json b/packages/test-data/.eslintrc.json
index 052a5874..647c8ed3 100644
--- a/packages/test-data/.eslintrc.json
+++ b/packages/test-data/.eslintrc.json
@@ -1,4 +1,7 @@
 {
   "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"]
+  "ignorePatterns": ["!**/*"],
+  "parserOptions": {
+    "project": ["packages/cli/tsconfig.*?.json"]
+  }
 }
diff --git a/packages/user-flow-cli-testing/.eslintrc.json b/packages/user-flow-cli-testing/.eslintrc.json
index 052a5874..647c8ed3 100644
--- a/packages/user-flow-cli-testing/.eslintrc.json
+++ b/packages/user-flow-cli-testing/.eslintrc.json
@@ -1,4 +1,7 @@
 {
   "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"]
+  "ignorePatterns": ["!**/*"],
+  "parserOptions": {
+    "project": ["packages/cli/tsconfig.*?.json"]
+  }
 }
diff --git a/packages/user-flow-example/.eslintrc.json b/packages/user-flow-example/.eslintrc.json
index 052a5874..647c8ed3 100644
--- a/packages/user-flow-example/.eslintrc.json
+++ b/packages/user-flow-example/.eslintrc.json
@@ -1,4 +1,7 @@
 {
   "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"]
+  "ignorePatterns": ["!**/*"],
+  "parserOptions": {
+    "project": ["packages/cli/tsconfig.*?.json"]
+  }
 }
diff --git a/packages/user-flow-gh-integration/.eslintrc.json b/packages/user-flow-gh-integration/.eslintrc.json
index 052a5874..647c8ed3 100644
--- a/packages/user-flow-gh-integration/.eslintrc.json
+++ b/packages/user-flow-gh-integration/.eslintrc.json
@@ -1,4 +1,7 @@
 {
   "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"]
+  "ignorePatterns": ["!**/*"],
+  "parserOptions": {
+    "project": ["packages/cli/tsconfig.*?.json"]
+  }
 }