diff --git a/.changeset/six-rockets-jump.md b/.changeset/six-rockets-jump.md
deleted file mode 100644
index c03f87c49..000000000
--- a/.changeset/six-rockets-jump.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fix CSS scanning bug that could lead to infinite loops
diff --git a/.changeset/slimy-turtles-boil.md b/.changeset/slimy-turtles-boil.md
deleted file mode 100644
index 86accb850..000000000
--- a/.changeset/slimy-turtles-boil.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fix client:only behavior when only a single renderer is configured
diff --git a/examples/blog-multiple-authors/package.json b/examples/blog-multiple-authors/package.json
index 6878c5bb5..25b5aec33 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.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 5989a9b7f..1fdc9308a 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/docs/package.json b/examples/docs/package.json
index dc221cc62..02fb083ff 100644
--- a/examples/docs/package.json
+++ b/examples/docs/package.json
@@ -12,7 +12,7 @@
     "@docsearch/react": "^1.0.0-alpha.27"
   },
   "devDependencies": {
-    "astro": "^0.21.0",
+    "astro": "^0.21.1",
     "@snowpack/plugin-dotenv": "^2.1.0"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index 406482dd4..52e81c69d 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-lit": "^0.2.0",
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index 2bd032f15..db298aded 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.2.0",
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 9104082f3..97b43dc5c 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 559863839..bd91ba4c8 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index 4e2088cb6..39d526196 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.2.0",
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index fbce7ed4a..3fdf67df1 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 75a504e6e..111d68e91 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 6d150ade8..fed2437d5 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/portfolio-svelte/package.json b/examples/portfolio-svelte/package.json
index 1f188ed60..e696eaada 100644
--- a/examples/portfolio-svelte/package.json
+++ b/examples/portfolio-svelte/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index 28eb5d584..b2108fbcd 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/starter/package.json b/examples/starter/package.json
index 24b403116..8643fbb03 100644
--- a/examples/starter/package.json
+++ b/examples/starter/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/subpath/package.json b/examples/subpath/package.json
index c08e893a0..5446e48e7 100644
--- a/examples/subpath/package.json
+++ b/examples/subpath/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 59c4ea35b..995f8f9f5 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.21.0",
+    "astro": "^0.21.1",
     "rehype-add-classes": "^1.0.0",
     "rehype-autolink-headings": "^6.1.0",
     "rehype-toc": "^3.0.2",
diff --git a/examples/with-markdown/package.json b/examples/with-markdown/package.json
index 8a7c00343..be4831828 100644
--- a/examples/with-markdown/package.json
+++ b/examples/with-markdown/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index aa64e3044..e96a6a625 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -16,6 +16,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.2.0",
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index 05c12b1c3..dc88bdfdd 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0",
+    "astro": "^0.21.1",
     "autoprefixer": "^10.4.0",
     "tailwindcss": "^2.2.19"
   }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 8aa06694e..0151ad7e4 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,12 @@
 # astro
 
+## 0.21.1
+
+### Patch Changes
+
+- 8775730e: Fix CSS scanning bug that could lead to infinite loops
+- aec4e8da: Fix client:only behavior when only a single renderer is configured
+
 ## 0.21.0
 
 ### Minor Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index ed2bfbbf1..5da882f53 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "author": "Skypack",
   "license": "MIT",
   "type": "module",
diff --git a/www/package.json b/www/package.json
index 6721514b0..467d00a46 100644
--- a/www/package.json
+++ b/www/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0"
+    "astro": "^0.21.1"
   }
 }