diff --git a/.bitmap b/.bitmap
index cf94a536..bd702cf4 100644
--- a/.bitmap
+++ b/.bitmap
@@ -188,12 +188,13 @@
         "mainFile": "index.ts",
         "rootDir": "angular/examples/my-angular-v17-env"
     },
-    /*"readme": {
+    "readme": {
+        "name": "readme",
         "scope": "bitdev.angular",
         "version": "1.0.1",
         "mainFile": "index.ts",
         "rootDir": "angular/readme"
-    },*/
+    },
     "templates/generators": {
         "name": "templates/generators",
         "scope": "bitdev.angular",
@@ -208,5 +209,12 @@
         "mainFile": "index.ts",
         "rootDir": "angular/templates/starters"
     },
-    "$schema-version": "17.0.0"
-}
+    "$schema-version": "17.0.0",
+    "_bit_lane": {
+        "id": {
+            "name": "release-18-10-23",
+            "scope": "bitdev.angular"
+        },
+        "exported": false
+    }
+}
\ No newline at end of file
diff --git a/angular/devkit/compiler/elements/component.json b/angular/devkit/compiler/elements/component.json
index 798d7f68..c1ac233c 100644
--- a/angular/devkit/compiler/elements/component.json
+++ b/angular/devkit/compiler/elements/component.json
@@ -32,12 +32,12 @@
           "typescript": "-"
         },
         "peerDependencies": {
-          "@angular/compiler": ">= 8.0.0",
-          "@angular/compiler-cli": ">= 8.0.0",
-          "@angular/core": ">= 8.0.0",
-          "@angular/elements": ">= 8.0.0",
-          "@angular/platform-browser": ">= 8.0.0",
-          "@angular/platform-browser-dynamic": ">= 8.0.0",
+          "@angular/compiler": ">= 13.0.0",
+          "@angular/compiler-cli": ">= 13.0.0",
+          "@angular/core": ">= 13.0.0",
+          "@angular/elements": ">= 13.0.0",
+          "@angular/platform-browser": ">= 13.0.0",
+          "@angular/platform-browser-dynamic": ">= 13.0.0",
           "react-dom": "-",
           "react": "-",
           "typescript": ">= 3.5.3"
diff --git a/angular/devkit/compiler/multi-compiler/component.json b/angular/devkit/compiler/multi-compiler/component.json
index bbf650d1..3af32b3d 100644
--- a/angular/devkit/compiler/multi-compiler/component.json
+++ b/angular/devkit/compiler/multi-compiler/component.json
@@ -18,7 +18,7 @@
           "@types/minimatch": "~3.0.4"
         },
         "peerDependencies": {
-          "@angular/compiler-cli": ">= 8.0.0"
+          "@angular/compiler-cli": ">= 13.0.0"
         }
       }
     }
diff --git a/angular/devkit/compiler/ng-packagr/component.json b/angular/devkit/compiler/ng-packagr/component.json
index 23d919c0..09222e05 100644
--- a/angular/devkit/compiler/ng-packagr/component.json
+++ b/angular/devkit/compiler/ng-packagr/component.json
@@ -13,7 +13,7 @@
           "ng-packagr": "-"
         },
         "peerDependencies": {
-          "@angular/compiler-cli": ">= 8.0.0",
+          "@angular/compiler-cli": ">= 13.0.0",
           "ng-packagr": ">=5.0.0"
         }
       }
diff --git a/angular/devkit/ng-compat/component.json b/angular/devkit/ng-compat/component.json
index 2557877f..c2f91fd2 100644
--- a/angular/devkit/ng-compat/component.json
+++ b/angular/devkit/ng-compat/component.json
@@ -11,7 +11,7 @@
         },
         "peerDependencies": {
           "@angular-devkit/build-angular": ">= 0.0.1",
-          "@angular/cli": ">= 8.0.0",
+          "@angular/cli": ">= 13.0.0",
           "webpack": ">= 4.44.2"
         }
       }
diff --git a/angular/devkit/preview/mounter/component.json b/angular/devkit/preview/mounter/component.json
index eb30ac38..8360571c 100644
--- a/angular/devkit/preview/mounter/component.json
+++ b/angular/devkit/preview/mounter/component.json
@@ -8,13 +8,13 @@
     "teambit.dependencies/dependency-resolver": {
       "policy": {
         "peerDependencies": {
-          "@angular/animations": ">= 8.0.0",
-          "@angular/compiler": ">= 8.0.0",
-          "@angular/common": ">= 8.0.0",
-          "@angular/core": ">= 8.0.0",
-          "@angular/elements": ">= 8.0.0",
-          "@angular/platform-browser": ">= 8.0.0",
-          "@angular/platform-browser-dynamic": ">= 8.0.0",
+          "@angular/animations": ">= 13.0.0",
+          "@angular/compiler": ">= 13.0.0",
+          "@angular/common": ">= 13.0.0",
+          "@angular/core": ">= 13.0.0",
+          "@angular/elements": ">= 13.0.0",
+          "@angular/platform-browser": ">= 13.0.0",
+          "@angular/platform-browser-dynamic": ">= 13.0.0",
           "typescript": ">= 3.5.3",
           "zone.js": ">= 0.9.1"
         }
diff --git a/angular/devkit/preview/preview/component.json b/angular/devkit/preview/preview/component.json
index 1431659e..89f2c9ce 100644
--- a/angular/devkit/preview/preview/component.json
+++ b/angular/devkit/preview/preview/component.json
@@ -12,13 +12,13 @@
           "dompurify": "3.0.5"
         },
         "peerDependencies": {
-          "@angular/animations": ">= 8.0.0",
-          "@angular/compiler": ">= 8.0.0",
-          "@angular/common": ">= 8.0.0",
-          "@angular/core": ">= 8.0.0",
-          "@angular/elements": ">= 8.0.0",
-          "@angular/platform-browser": ">= 8.0.0",
-          "@angular/platform-browser-dynamic": ">= 8.0.0",
+          "@angular/animations": ">= 13.0.0",
+          "@angular/compiler": ">= 13.0.0",
+          "@angular/common": ">= 13.0.0",
+          "@angular/core": ">= 13.0.0",
+          "@angular/elements": ">= 13.0.0",
+          "@angular/platform-browser": ">= 13.0.0",
+          "@angular/platform-browser-dynamic": ">= 13.0.0",
           "rxjs": "^6.5.5 || ^7.4.0",
           "typescript": ">= 3.5.3",
           "webpack": ">= 4.44.2",
diff --git a/angular/devkit/preview/runtime/component.json b/angular/devkit/preview/runtime/component.json
index 83aabea6..fa3b30d9 100644
--- a/angular/devkit/preview/runtime/component.json
+++ b/angular/devkit/preview/runtime/component.json
@@ -8,11 +8,11 @@
     "teambit.dependencies/dependency-resolver": {
       "policy": {
         "peerDependencies": {
-          "@angular/compiler": ">= 8.0.0",
-          "@angular/core": ">= 8.0.0",
-          "@angular/elements": ">= 8.0.0",
-          "@angular/platform-browser": ">= 8.0.0",
-          "@angular/platform-browser-dynamic": ">= 8.0.0",
+          "@angular/compiler": ">= 13.0.0",
+          "@angular/core": ">= 13.0.0",
+          "@angular/elements": ">= 13.0.0",
+          "@angular/platform-browser": ">= 13.0.0",
+          "@angular/platform-browser-dynamic": ">= 13.0.0",
           "react": "^17.0.2",
           "typescript": ">= 3.5.3",
           "zone.js": ">= 0.9.1"
diff --git a/angular/devkit/vite/component.json b/angular/devkit/vite/component.json
index 25149525..33bd3e89 100644
--- a/angular/devkit/vite/component.json
+++ b/angular/devkit/vite/component.json
@@ -39,6 +39,7 @@
           "@babel/runtime": "7.20.0"
         },
         "peerDependencies": {
+          "@angular/common": ">= 13.0.0",
           "typescript": ">= 3.5.3",
           "vite": "4.4.8"
         }
diff --git a/angular/envs/base-env/component.json b/angular/envs/base-env/component.json
index c0612def..13bf4353 100644
--- a/angular/envs/base-env/component.json
+++ b/angular/envs/base-env/component.json
@@ -37,12 +37,12 @@
         },
         "peerDependencies": {
           "@angular-devkit/build-angular": ">= 0.0.1",
-          "@angular/common": ">= 8.0.0",
-          "@angular/compiler-cli": ">= 8.0.0",
-          "@angular/core": ">= 8.0.0",
-          "@angular/platform-browser": ">= 8.0.0",
-          "@angular/platform-browser-dynamic": ">= 8.0.0",
-          "@angular/router": ">= 8.0.0",
+          "@angular/common": ">= 13.0.0",
+          "@angular/compiler-cli": ">= 13.0.0",
+          "@angular/core": ">= 13.0.0",
+          "@angular/platform-browser": ">= 13.0.0",
+          "@angular/platform-browser-dynamic": ">= 13.0.0",
+          "@angular/router": ">= 13.0.0",
           "jest": ">= 25.1.0",
           "jest-preset-angular": ">= 8.2.0",
           "rxjs": ">= 6.4.0",
diff --git a/workspace.jsonc b/workspace.jsonc
index aedae15b..a79e158e 100644
--- a/workspace.jsonc
+++ b/workspace.jsonc
@@ -94,7 +94,7 @@
   "bitdev.angular/envs/angular-v13-env": {},
   "bitdev.angular/envs/angular-v12-env": {},
   // Add angular apps (until this is no longer necessary)
-  "integration/demo-app": {},
+//  "integration/demo-app": {},
   /**
    * workspace variants allow you to set different subsets of configuration for components in your workspace.
    * this is extremely useful for upgrading, aligning and building components with a
@@ -119,9 +119,9 @@
       "teambit.harmony/node": {}
     },
     "angular/readme": {
-      "teambit.mdx/mdx": {},
+      "teambit.community/envs/community-mdx@4.0.1": {},
       "teambit.envs/envs": {
-        "env": "teambit.mdx/mdx"
+        "env": "teambit.community/envs/community-mdx"
       }
     },
     "integration/custom-env": {