diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01b9feda6743..c42ab2f27d05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+<a name="20.1.6"></a>
+
+# 20.1.6 (2025-08-13)
+
+### @schematics/angular
+
+| Commit                                                                                              | Type | Description                                                    |
+| --------------------------------------------------------------------------------------------------- | ---- | -------------------------------------------------------------- |
+| [584bc1d41](https://github.com/angular/angular-cli/commit/584bc1d4173e7f129aa20e829f1dfb03e1e0dc9e) | fix  | add extra prettier config                                      |
+| [02b0506fd](https://github.com/angular/angular-cli/commit/02b0506fde638b89510e5a78b3d190ba60a8d6ba) | fix  | correct configure the `typeSeparator` in the library schematic |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
 <a name="20.1.5"></a>
 
 # 20.1.5 (2025-08-06)
@@ -4129,6 +4142,7 @@ Alan Agius, Charles Lyding, Doug Parker, Joey Perrott and Piotr Wysocki
   ```scss
   @import 'font-awesome/scss/font-awesome';
   ```
+
   - By default the CLI will use Sass modern API, While not recommended, users can still opt to use legacy API by setting `NG_BUILD_LEGACY_SASS=1`.
 
 - Internally the Angular CLI now always set the TypeScript `target` to `ES2022` and `useDefineForClassFields` to `false` unless the target is set to `ES2022` or later in the TypeScript configuration. To control ECMA version and features use the Browerslist configuration.
diff --git a/WORKSPACE b/WORKSPACE
index 67bc38b6aed7..15810382e524 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -17,16 +17,6 @@ http_archive(
     urls = ["https://github.com/bazelbuild/rules_webtesting/releases/download/0.3.5/rules_webtesting.tar.gz"],
 )
 
-http_archive(
-    name = "build_bazel_rules_nodejs",
-    sha256 = "5dd1e5dea1322174c57d3ca7b899da381d516220793d0adef3ba03b9d23baa8e",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.3/rules_nodejs-5.8.3.tar.gz"],
-)
-
-load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies")
-
-build_bazel_rules_nodejs_dependencies()
-
 http_archive(
     name = "aspect_rules_js",
     sha256 = "961393890a58de989ad7aa36ce147fc9b15a77c8144454889bf068bdd12c5165",
@@ -133,12 +123,6 @@ aspect_bazel_lib_dependencies()
 
 aspect_bazel_lib_register_toolchains()
 
-load("@build_bazel_rules_nodejs//toolchains/esbuild:esbuild_repositories.bzl", "esbuild_repositories")
-
-esbuild_repositories(
-    npm_repository = "npm",
-)
-
 load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 
 npm_translate_lock(
@@ -230,7 +214,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "devinfra",
-    commit = "361ceb676a715e1aedf3d6cd64ecae5dee6a3e5f",
+    commit = "0b24ffe8d1f7144d6302dafcc214790e708e598a",
     remote = "https://github.com/angular/dev-infra.git",
 )
 
diff --git a/package.json b/package.json
index c3fd53dc2d82..cb10d50d5684 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular/devkit-repo",
-  "version": "20.1.5",
+  "version": "20.1.6",
   "private": true,
   "description": "Software Development Kit for Angular",
   "keywords": [
diff --git a/packages/angular/ssr/node/test/BUILD.bazel b/packages/angular/ssr/node/test/BUILD.bazel
index e816a3e022ae..5a7c45126966 100644
--- a/packages/angular/ssr/node/test/BUILD.bazel
+++ b/packages/angular/ssr/node/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@devinfra//bazel/spec-bundling:index_rjs.bzl", "spec_bundle")
+load("@devinfra//bazel/spec-bundling:index.bzl", "spec_bundle")
 load("//tools:defaults.bzl", "jasmine_test", "ts_project")
 
 ts_project(
diff --git a/packages/angular/ssr/test/BUILD.bazel b/packages/angular/ssr/test/BUILD.bazel
index d18700a662ad..98ee6bbc4d4d 100644
--- a/packages/angular/ssr/test/BUILD.bazel
+++ b/packages/angular/ssr/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@devinfra//bazel/spec-bundling:index_rjs.bzl", "spec_bundle")
+load("@devinfra//bazel/spec-bundling:index.bzl", "spec_bundle")
 load("//tools:defaults.bzl", "jasmine_test", "ts_project")
 
 ts_project(
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index d96cc8b505a8..361bd1a9354b 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -198,6 +198,9 @@ export default function (options: LibraryOptions): Rule {
             flat: true,
             path: sourceDir,
             project: packageName,
+            // Explicitly set the `typeSeparator` this also ensures that the generated files are valid even if the `module` schematic
+            // inherits its `typeSeparator` from the workspace.
+            typeSeparator: '-',
           }),
       schematic('component', {
         name: options.name,
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index d6381afce198..370be58cde6a 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -141,9 +141,7 @@
     },
     "zoneless": {
       "description": "Create an initial application that does not utilize `zone.js`.",
-      "x-prompt": "Do you want to create a 'zoneless' application without zone.js (Developer Preview)?",
-      "type": "boolean",
-      "default": false
+      "type": "boolean"
     }
   },
   "required": ["name", "version"]
diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template
index 8b3901b02010..d9876827b386 100644
--- a/packages/schematics/angular/workspace/files/package.json.template
+++ b/packages/schematics/angular/workspace/files/package.json.template
@@ -9,6 +9,8 @@
     "test": "ng test"<% } %>
   },
   "prettier": {
+    "printWidth": 100,
+    "singleQuote": true,
     "overrides": [
       {
         "files": "*.html",