diff --git a/.changeset/pre.json b/.changeset/pre.json
index 1202677b1..aa59a7750 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -42,7 +42,18 @@
     "@astrojs/renderer-solid": "0.3.1",
     "@astrojs/renderer-svelte": "0.3.1",
     "@astrojs/renderer-vue": "0.3.0",
-    "astro-scripts": "0.0.1"
+    "astro-scripts": "0.0.1",
+    "@example/with-markdown-shiki": "0.0.1"
   },
-  "changesets": []
+  "changesets": [
+    "afraid-crabs-heal",
+    "calm-suns-give",
+    "chatty-spies-wink",
+    "empty-snails-allow",
+    "mighty-lamps-drive",
+    "old-parents-obey",
+    "rotten-planets-love",
+    "shaggy-shoes-leave",
+    "tiny-owls-dress"
+  ]
 }
diff --git a/docs/package.json b/docs/package.json
index 0690b95b6..9f3c7debd 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -16,7 +16,7 @@
     "lint:linkcheck:remote": "blc -ro --user-agent 'broken-link-checker/0.7.8' 'https://docs.astro.build/'"
   },
   "devDependencies": {
-    "astro": "^0.22.0",
+    "astro": "^0.23.0-next.0",
     "broken-link-checker": "^0.7.8",
     "npm-run-all": "^4.1.5",
     "pa11y-ci": "^3.0.1",
diff --git a/examples/blog-multiple-authors/package.json b/examples/blog-multiple-authors/package.json
index 276c293a4..362846cc6 100644
--- a/examples/blog-multiple-authors/package.json
+++ b/examples/blog-multiple-authors/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 089fbef2d..2a3a9943b 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json
index 8cde2f71b..efd8f0c0e 100644
--- a/examples/component/demo/package.json
+++ b/examples/component/demo/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index ea0b680c0..5198540a1 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -12,6 +12,6 @@
     "serve": "astro --project-root demo preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/docs/package.json b/examples/docs/package.json
index dd88e45dd..f08607578 100644
--- a/examples/docs/package.json
+++ b/examples/docs/package.json
@@ -12,6 +12,6 @@
     "@docsearch/react": "^1.0.0-alpha.28"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/fast-build/package.json b/examples/fast-build/package.json
index 32aeb5a44..c883dc666 100644
--- a/examples/fast-build/package.json
+++ b/examples/fast-build/package.json
@@ -10,7 +10,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20",
+    "astro": "^0.23.0-next.0",
     "preact": "~10.5.15",
     "unocss": "^0.15.5",
     "vite-imagetools": "^4.0.1"
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index b33cd667e..7d91154a5 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index b1ee40ec1..6d0785d25 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-lit": "^0.3.1",
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index d489a9ec5..95f628eb7 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.3.1",
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 521a29f96..e147f2dad 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index b7e3d3592..4239c399f 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index dc135c014..a779a6f13 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.3.1",
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index ffd13b628..684d3d310 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index cd0c0166e..5dbfeb416 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 433ea77e4..6b2ba48ae 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/portfolio-svelte/package.json b/examples/portfolio-svelte/package.json
index 15c99e06c..b6ec66c45 100644
--- a/examples/portfolio-svelte/package.json
+++ b/examples/portfolio-svelte/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index c549e3a40..267e05676 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/starter/package.json b/examples/starter/package.json
index 125bdff49..6aba66b41 100644
--- a/examples/starter/package.json
+++ b/examples/starter/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/subpath/package.json b/examples/subpath/package.json
index 504776e23..886f3cd86 100644
--- a/examples/subpath/package.json
+++ b/examples/subpath/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 6a6b1f85c..46f359d44 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20",
+    "astro": "^0.23.0-next.0",
     "hast-util-select": "5.0.1",
     "rehype-autolink-headings": "^6.1.0",
     "rehype-slug": "^5.0.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index 1573fe586..3216c44aa 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/with-markdown/package.json b/examples/with-markdown/package.json
index b2b94650e..cca5daa95 100644
--- a/examples/with-markdown/package.json
+++ b/examples/with-markdown/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index f8e19c75f..bf813b90a 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -17,6 +17,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.3.1",
-    "astro": "^0.22.20"
+    "astro": "^0.23.0-next.0"
   }
 }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index e4f9b799c..3185594f9 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20",
+    "astro": "^0.23.0-next.0",
     "autoprefixer": "^10.4.0",
     "tailwindcss": "^3.0.5"
   }
diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json
index 8a49bfe37..8c4e5ebd8 100644
--- a/examples/with-vite-plugin-pwa/package.json
+++ b/examples/with-vite-plugin-pwa/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.22.20",
+    "astro": "^0.23.0-next.0",
     "vite-plugin-pwa": "0.11.5"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index a14d58464..bd1dce40f 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,38 @@
 # astro
 
+## 0.23.0-next.0
+
+### Minor Changes
+
+- [#2489](https://github.com/withastro/astro/pull/2489) [`618a16f5`](https://github.com/withastro/astro/commit/618a16f59d4037cff1665110f0ed111a96a96437) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Add support for the `set:html` and `set:text` directives.
+
+  With the introduction of these directives, unescaped HTML content in expressions is now deprecated. Please migrate to `set:html` in order to continue injecting unescaped HTML in future versions of Astro—you can use `<Fragment set:html={content}>` to avoid a wrapper element. `set:text` allows you to opt-in to escaping now, but it will soon become the default.
+
+* [#2494](https://github.com/withastro/astro/pull/2494) [`d7149f9b`](https://github.com/withastro/astro/commit/d7149f9b2f9a9092b33fa56cedecc446247faf64) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Refactor dev server to use vite server internally.
+
+  This should be an invisible change, and no breaking changes are expected from this change. However, it is a big enough refactor that some unexpected changes may occur. If you've experienced a regression in the dev server, it is most likely a bug!
+
+- [#2471](https://github.com/withastro/astro/pull/2471) [`c9bb1147`](https://github.com/withastro/astro/commit/c9bb1147cbfae20e3ecdf29ef2866a183b3b18e3) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Standardize trailing subpath behavior in config.
+
+  Most users are not aware of the subtle differences between `/foo` and `/foo/`. Internally, we have to handle both which means that we are constantly worrying about the format of the URL, needing to add/remove trailing slashes when we go to work with this property, etc. This change transforms all `site` values to use a trailing slash internally, which should help reduce bugs for both users and maintainers.
+
+### Patch Changes
+
+- [#2486](https://github.com/withastro/astro/pull/2486) [`6bd165f8`](https://github.com/withastro/astro/commit/6bd165f84cd3a1550b29fec539af814360c87f54) Thanks [@matthewp](https://github.com/matthewp)! - Fix for the static build when project contains a space
+
+* [#2506](https://github.com/withastro/astro/pull/2506) [`187d5128`](https://github.com/withastro/astro/commit/187d5128af9ea388589f12e7b062b1e6a38ac67a) Thanks [@jonathantneal](https://github.com/jonathantneal)! - Fix an issue rendering content within HTMLElement
+
+- [#2511](https://github.com/withastro/astro/pull/2511) [`3d2c1849`](https://github.com/withastro/astro/commit/3d2c184962925300ca75c96b8115f88e68140ec7) Thanks [@matthewp](https://github.com/matthewp)! - Bug fix for `define:vars` with the --experimental-static-build flag
+
+* [#2471](https://github.com/withastro/astro/pull/2471) [`c9bb1147`](https://github.com/withastro/astro/commit/c9bb1147cbfae20e3ecdf29ef2866a183b3b18e3) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Respect subpath URL paths in the fetchContent url property.
+
+  This fixes an issue where fetchContent() URL property did not include the buildOptions.site path in it.
+
+- [#2497](https://github.com/withastro/astro/pull/2497) [`6fe1b027`](https://github.com/withastro/astro/commit/6fe1b0279fce5a7a0e90ff79746ea0b641da3e21) Thanks [@JuanM04](https://github.com/JuanM04)! - Bumped Shiki version
+
+- Updated dependencies [[`6fe1b027`](https://github.com/withastro/astro/commit/6fe1b0279fce5a7a0e90ff79746ea0b641da3e21)]:
+  - @astrojs/markdown-remark@0.6.1-next.0
+
 ## 0.22.20
 
 ### Patch Changes
@@ -1202,10 +1235,10 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve
 
   ```js
   export default {
-    markdownOptions: {
-      remarkPlugins: ['remark-slug', ['remark-autolink-headings', { behavior: 'prepend' }]],
-      rehypePlugins: ['rehype-slug', ['rehype-autolink-headings', { behavior: 'prepend' }]],
-    },
+  	markdownOptions: {
+  		remarkPlugins: ['remark-slug', ['remark-autolink-headings', { behavior: 'prepend' }]],
+  		rehypePlugins: ['rehype-slug', ['rehype-autolink-headings', { behavior: 'prepend' }]],
+  	},
   };
   ```
 
@@ -1225,10 +1258,10 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve
 
   ```js
   export default {
-    name: '@matthewp/my-renderer',
-    server: './server.js',
-    client: './client.js',
-    hydrationPolyfills: ['./my-polyfill.js'],
+  	name: '@matthewp/my-renderer',
+  	server: './server.js',
+  	client: './client.js',
+  	hydrationPolyfills: ['./my-polyfill.js'],
   };
   ```
 
diff --git a/packages/astro/package.json b/packages/astro/package.json
index a1b3b11c6..a0f55368a 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "0.22.20",
+  "version": "0.23.0-next.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -57,7 +57,7 @@
   "dependencies": {
     "@astrojs/compiler": "^0.10.1",
     "@astrojs/language-server": "^0.8.6",
-    "@astrojs/markdown-remark": "^0.6.0",
+    "@astrojs/markdown-remark": "^0.6.1-next.0",
     "@astrojs/prism": "0.4.0",
     "@astrojs/renderer-preact": "^0.4.0",
     "@astrojs/renderer-react": "0.4.1",
diff --git a/packages/markdown/remark/CHANGELOG.md b/packages/markdown/remark/CHANGELOG.md
index 6f33d7f06..a799087dc 100644
--- a/packages/markdown/remark/CHANGELOG.md
+++ b/packages/markdown/remark/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/markdown-remark
 
+## 0.6.1-next.0
+
+### Patch Changes
+
+- [#2497](https://github.com/withastro/astro/pull/2497) [`6fe1b027`](https://github.com/withastro/astro/commit/6fe1b0279fce5a7a0e90ff79746ea0b641da3e21) Thanks [@JuanM04](https://github.com/JuanM04)! - Add Shiki as an alternative to Prism
+
 ## 0.6.0
 
 ### Minor Changes
@@ -105,10 +111,10 @@
 
   ```js
   export default {
-    markdownOptions: {
-      remarkPlugins: ['remark-slug', ['remark-autolink-headings', { behavior: 'prepend' }]],
-      rehypePlugins: ['rehype-slug', ['rehype-autolink-headings', { behavior: 'prepend' }]],
-    },
+  	markdownOptions: {
+  		remarkPlugins: ['remark-slug', ['remark-autolink-headings', { behavior: 'prepend' }]],
+  		rehypePlugins: ['rehype-slug', ['rehype-autolink-headings', { behavior: 'prepend' }]],
+  	},
   };
   ```
 
diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json
index 00a023d1d..2be18417b 100644
--- a/packages/markdown/remark/package.json
+++ b/packages/markdown/remark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "0.6.0",
+  "version": "0.6.1-next.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",