diff --git a/.changeset/happy-beans-protect.md b/.changeset/happy-beans-protect.md
deleted file mode 100644
index cf6f8a8bcced..000000000000
--- a/.changeset/happy-beans-protect.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fix i18n fallback routing with routing strategy of always-prefix
diff --git a/.changeset/tall-hotels-argue.md b/.changeset/tall-hotels-argue.md
deleted file mode 100644
index aaa5c84dd6d4..000000000000
--- a/.changeset/tall-hotels-argue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes an issue where the presence of a slot in a page led to an error.
diff --git a/.changeset/wicked-books-appear.md b/.changeset/wicked-books-appear.md
deleted file mode 100644
index 930091da7a1c..000000000000
--- a/.changeset/wicked-books-appear.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fix edge case where `<style>` updates inside of `.astro` files would ocassionally fail to update without reloading the page.
diff --git a/.changeset/young-trains-shout.md b/.changeset/young-trains-shout.md
deleted file mode 100644
index 2a635eb1eb05..000000000000
--- a/.changeset/young-trains-shout.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-'astro': patch
----
-
-The configuration `i18n.routingStrategy` has been replaced with an object called `routing`.
-
-```diff
-export default defineConfig({
-  experimental: {
-      i18n: {
--          routingStrategy: "prefix-always",
-+          routing: {
-+              prefixDefaultLocale: true,
-+          }  
-      }
-  }
-})
-```
-
-```diff
-export default defineConfig({
-  experimental: {
-      i18n: {
--          routingStrategy: "prefix-other-locales",
-+          routing: {
-+              prefixDefaultLocale: false,
-+          }  
-      }
-  }
-})
-```
diff --git a/examples/basics/package.json b/examples/basics/package.json
index e1dc940b9907..99385b3388ee 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 3a957ea6b6a7..8d219a0169c7 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^1.1.5",
     "@astrojs/rss": "^3.0.0",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index 0bd0ad401e1d..ea1b79aa8131 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 9e0ad984b841..bb171d9a5dda 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.7.2",
     "alpinejs": "^3.12.3",
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index 6462fe14d29c..642918c90221 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.3",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index 8ab8e399435f..d0bbc962e51a 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^4.0.4",
     "@astrojs/vue": "^3.0.4",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "preact": "^10.17.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index a920c3ad666a..b3a9a16d04e8 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "preact": "^10.17.1"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index d076319b0e82..0951f6f422ed 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.6",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index 109a2a24a8df..8e98d49b32e6 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "solid-js": "^1.7.11"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index b253f3924f0d..f921627ec3c9 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^4.0.4",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "svelte": "^4.2.0"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 73e38fb4b7fd..da9a4e26f7a4 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^3.0.4",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "vue": "^3.3.4"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index 3dad5fae8da3..ccde2aca0fcd 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.1.0",
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index 2b3d305304ff..6ca7435b491b 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index 1710d8a74c14..744390cc434b 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.1.0",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 842b7f5c49a5..510318d044f2 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index 98149f79da83..150730ebd569 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index fd8047685826..b2b7e388a9d8 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index d1290c3151ed..22600d5f02cd 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^6.1.0",
     "@astrojs/svelte": "^4.0.4",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "svelte": "^4.2.0"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
index b3ec335728d0..bb497b50d3a4 100644
--- a/examples/view-transitions/package.json
+++ b/examples/view-transitions/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.0.2",
     "@astrojs/node": "^6.1.0",
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index 11df7492e2d2..60f20a3c8b33 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.7.2",
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 025bed5abf5b..354f1515b3bc 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^3.5.0",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "hast-util-select": "^5.0.5",
     "rehype-autolink-headings": "^6.1.1",
     "rehype-slug": "^5.1.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index 45211b660590..dd11e29e759c 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.6.3"
+    "astro": "^3.6.4"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index 97f54fcd91e9..7bebf6a9a914 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^1.1.5",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "preact": "^10.17.1"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 76a922b34cec..53347ca8a09f 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "nanostores": "^0.9.3",
     "preact": "^10.17.1"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index 1a6102a35f41..d73fd1dbd896 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^1.1.5",
     "@astrojs/tailwind": "^5.0.2",
     "@types/canvas-confetti": "^1.6.0",
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.6.0",
     "postcss": "^8.4.28",
diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json
index 5f33e30e8235..bcb4c32afb17 100644
--- a/examples/with-vite-plugin-pwa/package.json
+++ b/examples/with-vite-plugin-pwa/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "vite-plugin-pwa": "0.16.4",
     "workbox-window": "^7.0.0"
   }
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index bd42491066df..34723600d48e 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^3.6.3",
+    "astro": "^3.6.4",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 1887bd5510ba..0869b6953994 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,43 @@
 # astro
 
+## 3.6.4
+
+### Patch Changes
+
+- [#9226](https://github.com/withastro/astro/pull/9226) [`8f8a40e93`](https://github.com/withastro/astro/commit/8f8a40e93d6a0774ba84a6f5db8c42cd81db005e) Thanks [@outofambit](https://github.com/outofambit)! - Fix i18n fallback routing with routing strategy of always-prefix
+
+- [#9179](https://github.com/withastro/astro/pull/9179) [`3f28336d9`](https://github.com/withastro/astro/commit/3f28336d9a52d7e4364d455ee3128d14d10a078a) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes an issue where the presence of a slot in a page led to an error.
+
+- [#9219](https://github.com/withastro/astro/pull/9219) [`067a65f5b`](https://github.com/withastro/astro/commit/067a65f5b4d163bf1944cf47e6bf891f0b93553f) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Fix edge case where `<style>` updates inside of `.astro` files would ocassionally fail to update without reloading the page.
+
+- [#9236](https://github.com/withastro/astro/pull/9236) [`27d3e86e4`](https://github.com/withastro/astro/commit/27d3e86e4c8d04101113ab7a53477f26a4fb0619) Thanks [@ematipico](https://github.com/ematipico)! - The configuration `i18n.routingStrategy` has been replaced with an object called `routing`.
+
+  ```diff
+  export default defineConfig({
+    experimental: {
+        i18n: {
+  -          routingStrategy: "prefix-always",
+  +          routing: {
+  +              prefixDefaultLocale: true,
+  +          }
+        }
+    }
+  })
+  ```
+
+  ```diff
+  export default defineConfig({
+    experimental: {
+        i18n: {
+  -          routingStrategy: "prefix-other-locales",
+  +          routing: {
+  +              prefixDefaultLocale: false,
+  +          }
+        }
+    }
+  })
+  ```
+
 ## 3.6.3
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index d4a6dcbe617f..0d05e94a65ac 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.6.3",
+  "version": "3.6.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ea1281c2a6ae..56d21b8899a3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,7 +125,7 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/blog:
@@ -140,13 +140,13 @@ importers:
         specifier: ^3.0.3
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/component:
     devDependencies:
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/framework-alpine:
@@ -161,7 +161,7 @@ importers:
         specifier: ^3.12.3
         version: 3.13.2
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/framework-lit:
@@ -173,7 +173,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       lit:
         specifier: ^2.8.0
@@ -197,7 +197,7 @@ importers:
         specifier: ^3.0.4
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       preact:
         specifier: ^10.17.1
@@ -227,7 +227,7 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1(preact@10.18.1)
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       preact:
         specifier: ^10.17.1
@@ -245,7 +245,7 @@ importers:
         specifier: ^18.2.7
         version: 18.2.14
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       react:
         specifier: ^18.2.0
@@ -260,7 +260,7 @@ importers:
         specifier: ^3.0.2
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.7.11
@@ -272,7 +272,7 @@ importers:
         specifier: ^4.0.4
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.0
@@ -284,7 +284,7 @@ importers:
         specifier: ^3.0.4
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       vue:
         specifier: ^3.3.4
@@ -296,13 +296,13 @@ importers:
         specifier: ^6.1.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/middleware:
@@ -311,7 +311,7 @@ importers:
         specifier: ^6.1.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       html-minifier:
         specifier: ^4.0.0
@@ -320,19 +320,19 @@ importers:
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/non-html-pages:
     dependencies:
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/ssr:
@@ -344,7 +344,7 @@ importers:
         specifier: ^4.0.4
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.0
@@ -359,7 +359,7 @@ importers:
         specifier: ^5.0.2
         version: link:../../packages/integrations/tailwind
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/with-markdoc:
@@ -368,7 +368,7 @@ importers:
         specifier: ^0.7.2
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/with-markdown-plugins:
@@ -377,7 +377,7 @@ importers:
         specifier: ^3.5.0
         version: link:../../packages/markdown/remark
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       hast-util-select:
         specifier: ^5.0.5
@@ -398,7 +398,7 @@ importers:
   examples/with-markdown-shiki:
     dependencies:
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
 
   examples/with-mdx:
@@ -410,7 +410,7 @@ importers:
         specifier: ^3.0.1
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       preact:
         specifier: ^10.17.1
@@ -425,7 +425,7 @@ importers:
         specifier: ^0.5.0
         version: 0.5.0(nanostores@0.9.4)(preact@10.18.1)
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.9.3
@@ -446,7 +446,7 @@ importers:
         specifier: ^1.6.0
         version: 1.6.2
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       autoprefixer:
         specifier: ^10.4.15
@@ -464,7 +464,7 @@ importers:
   examples/with-vite-plugin-pwa:
     dependencies:
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       vite-plugin-pwa:
         specifier: 0.16.4
@@ -476,7 +476,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^3.6.3
+        specifier: ^3.6.4
         version: link:../../packages/astro
       vitest:
         specifier: ^0.34.2