diff --git a/.changeset/spicy-seas-check.md b/.changeset/spicy-seas-check.md
deleted file mode 100644
index 44853498eda..00000000000
--- a/.changeset/spicy-seas-check.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-'@builder.io/qwik-city': patch
----
-
-fix: SPA routing is broken unless origin matches value in in vite.config #8093
-
-If the SSG origin was set to `localhost:3000` and a user visited from `127.0.0.1:3000`, SPA routing would be broken.
-
-Internally, useNavigate's context provider `goto` checks the new destination with the last route location. If the
-origin is different, it just does a normal browser navigation. This makes sense; links to other origins cannot use
-SPA routing. However, the initial route it compares was using an origin that came from the server environment.
-
-Now, the first navigation will set that initial route to the browser's actual href, eliminating the erroneous
-origin mismatch for SPA navigations.
diff --git a/.changeset/tiny-tires-wait.md b/.changeset/tiny-tires-wait.md
deleted file mode 100644
index 3ea8e1fcd71..00000000000
--- a/.changeset/tiny-tires-wait.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@builder.io/qwik-city': patch
----
-
-FIX: `this` in various Qwik-City handlers is now `RequestEvent` again.
diff --git a/packages/create-qwik/CHANGELOG.md b/packages/create-qwik/CHANGELOG.md
index a68abd247bd..b8b045c1a92 100644
--- a/packages/create-qwik/CHANGELOG.md
+++ b/packages/create-qwik/CHANGELOG.md
@@ -1,5 +1,7 @@
 # create-qwik
 
+## 1.17.2
+
 ## 1.17.1
 
 ## 1.17.0
diff --git a/packages/create-qwik/package.json b/packages/create-qwik/package.json
index 6798d7ff965..a7e3489c629 100644
--- a/packages/create-qwik/package.json
+++ b/packages/create-qwik/package.json
@@ -1,7 +1,7 @@
 {
   "name": "create-qwik",
   "description": "Interactive CLI for create Qwik projects and adding features.",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "author": "Builder.io Team",
   "bin": "./create-qwik.cjs",
   "bugs": "https://github.com/QwikDev/qwik/issues",
diff --git a/packages/eslint-plugin-qwik/CHANGELOG.md b/packages/eslint-plugin-qwik/CHANGELOG.md
index 2b1bd89271c..1ab10a95c8f 100644
--- a/packages/eslint-plugin-qwik/CHANGELOG.md
+++ b/packages/eslint-plugin-qwik/CHANGELOG.md
@@ -1,5 +1,7 @@
 # eslint-plugin-qwik
 
+## 1.17.2
+
 ## 1.17.1
 
 ## 1.17.0
diff --git a/packages/eslint-plugin-qwik/package.json b/packages/eslint-plugin-qwik/package.json
index 9c49a98788b..f83867edebb 100644
--- a/packages/eslint-plugin-qwik/package.json
+++ b/packages/eslint-plugin-qwik/package.json
@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-qwik",
   "description": "An Open-Source sub-framework designed with a focus on server-side-rendering, lazy-loading, and styling/animation.",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "author": "Builder Team",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
diff --git a/packages/qwik-city/CHANGELOG.md b/packages/qwik-city/CHANGELOG.md
index aca7d8a6e24..874e071e397 100644
--- a/packages/qwik-city/CHANGELOG.md
+++ b/packages/qwik-city/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @builder.io/qwik-city
 
+## 1.17.2
+
+### Patch Changes
+
+- 🐞🩹 history behavior in some edge cases has been brought inline with the E2E tests that were accidentally disabled. (the tests can't be disabled any more either) (by [@wmertens](https://github.com/wmertens) in [`206f3e0`](https://github.com/QwikDev/qwik/commit/206f3e07caad5a5736f160c09a618f348896860d))
+
+- 🐞🩹 SPA routing is broken unless origin matches value in in vite.config #8093 (by [@termermc](https://github.com/termermc) in [#8097](https://github.com/QwikDev/qwik/pull/8097))
+
+  If the SSG origin was set to `localhost:3000` and a user visited from `127.0.0.1:3000`, SPA routing would be broken.
+
+  Internally, useNavigate's context provider `goto` checks the new destination with the last route location. If the
+  origin is different, it just does a normal browser navigation. This makes sense; links to other origins cannot use
+  SPA routing. However, the initial route it compares was using an origin that came from the server environment.
+
+  Now, the first navigation will set that initial route to the browser's actual href, eliminating the erroneous
+  origin mismatch for SPA navigations.
+
+- 🐞🩹 `this` in various Qwik-City handlers is now `RequestEvent` again. (by [@wmertens](https://github.com/wmertens) in [#8111](https://github.com/QwikDev/qwik/pull/8111))
+
 ## 1.17.1
 
 ### Patch Changes
diff --git a/packages/qwik-city/package.json b/packages/qwik-city/package.json
index b71e96e9224..7c9cb95d539 100644
--- a/packages/qwik-city/package.json
+++ b/packages/qwik-city/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@builder.io/qwik-city",
   "description": "The meta-framework for Qwik.",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@mdx-js/mdx": "^3.1.1",
diff --git a/packages/qwik/CHANGELOG.md b/packages/qwik/CHANGELOG.md
index a41a6395123..7a0617e0ff8 100644
--- a/packages/qwik/CHANGELOG.md
+++ b/packages/qwik/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @builder.io/qwik
 
+## 1.17.2
+
 ## 1.17.1
 
 ### Patch Changes
diff --git a/packages/qwik/package.json b/packages/qwik/package.json
index bb9eb2a3364..4ec39812727 100644
--- a/packages/qwik/package.json
+++ b/packages/qwik/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@builder.io/qwik",
   "description": "An Open-Source sub-framework designed with a focus on server-side-rendering, lazy-loading, and styling/animation.",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "annotation": "This package.json is for internal use in the monorepo, the build actually makes a new package.json for the published package via scripts/package-json.ts",
   "bin": {
     "qwik": "./qwik-cli.cjs"