diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json
index 08fa60e4bfc..183521198b6 100644
--- a/generators/angular/resources/package.json
+++ b/generators/angular/resources/package.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "@angular/common": "20.3.14",
-    "@fortawesome/angular-fontawesome": "3.0.0",
+    "@angular/common": "21.0.0",
+    "@fortawesome/angular-fontawesome": "4.0.0",
     "@fortawesome/fontawesome-svg-core": "7.1.0",
     "@fortawesome/free-solid-svg-icons": "7.1.0",
-    "@ng-bootstrap/ng-bootstrap": "19.0.1",
+    "@ng-bootstrap/ng-bootstrap": "20.0.0-rc.0",
     "@ngx-translate/core": "17.0.0",
     "@ngx-translate/http-loader": "17.0.0",
     "@stomp/rx-stomp": "2.3.0",
@@ -15,7 +15,7 @@
     "rxjs": "7.8.2",
     "sockjs-client": "1.6.1",
     "tslib": "2.8.1",
-    "zone.js": "0.15.1"
+    "zone.js": "0.16.0"
   },
   "devDependencies": {
     "@angular-architects/module-federation": "20.0.0",
@@ -23,8 +23,8 @@
     "@angular-builders/custom-esbuild": "20.0.0",
     "@angular-builders/custom-webpack": "20.0.0",
     "@angular-builders/jest": "20.0.0",
-    "@angular/build": "20.3.10",
-    "@angular/cli": "20.3.10",
+    "@angular/build": "21.0.0",
+    "@angular/cli": "21.0.0",
     "@eslint/js": "9.39.1",
     "@types/folder-hash": "4.0.4",
     "@types/jest": "29.5.14",
@@ -54,7 +54,7 @@
     "ts-jest": "29.4.5",
     "typescript": "5.9.3",
     "typescript-eslint": "8.47.0",
-    "vitest": "3.2.4",
+    "vitest": "4.0.12",
     "vitest-sonar-reporter": "3.0.0",
     "webpack": "5.103.0",
     "webpack-bundle-analyzer": "5.0.1",
diff --git a/generators/angular/templates/package.json.ejs b/generators/angular/templates/package.json.ejs
index 647934d9426..cdd59b9c9ed 100644
--- a/generators/angular/templates/package.json.ejs
+++ b/generators/angular/templates/package.json.ejs
@@ -103,6 +103,12 @@
   "config": {
     "default_environment": "prod"
   },
+  "overrides": {
+    "ngx-infinite-scroll": {
+      "@angular/core": "<%= nodeDependencies['@angular/common'] %>",
+      "@angular/common": "<%= nodeDependencies['@angular/common'] %>"
+    }
+  },
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "<%- nodePackageManager %> run lint -- --fix",
diff --git a/generators/client/command.ts b/generators/client/command.ts
index 7f655dae71b..48a634f59ad 100644
--- a/generators/client/command.ts
+++ b/generators/client/command.ts
@@ -152,7 +152,7 @@ const command = {
       },
       scope: 'storage',
       choices: ['jest', 'vitest'],
-      default: ctx => (ctx?.clientFramework === 'vue' ? 'vitest' : 'jest'),
+      default: ctx => (ctx?.clientFramework !== 'react' ? 'vitest' : 'jest'),
     },
     clientTestFrameworks: {
       description: 'Client test frameworks',