diff --git a/.changeset/dry-kings-hear.md b/.changeset/dry-kings-hear.md
index c877785329..06ac1ef877 100644
--- a/.changeset/dry-kings-hear.md
+++ b/.changeset/dry-kings-hear.md
@@ -2,4 +2,4 @@
 '@backstage/integration': patch
 ---
 
-Fix gitlab handling of paths with spaces
+Fix GitLab handling of paths with spaces
diff --git a/.changeset/nervous-pens-destroy.md b/.changeset/nervous-pens-destroy.md
new file mode 100644
index 0000000000..da8ebc162d
--- /dev/null
+++ b/.changeset/nervous-pens-destroy.md
@@ -0,0 +1,33 @@
+---
+'@backstage/cli': minor
+---
+
+We have updated the default `eslint` rules in the `@backstage/cli` package.
+
+```diff
+-'@typescript-eslint/no-shadow': 'off',
+-'@typescript-eslint/no-redeclare': 'off',
++'no-shadow': 'off',
++'no-redeclare': 'off',
++'@typescript-eslint/no-shadow': 'error',
++'@typescript-eslint/no-redeclare': 'error',
+```
+
+The rules are documented [here](https://eslint.org/docs/rules/no-shadow) and [here](https://eslint.org/docs/rules/no-redeclare).
+
+This involved a large number of small changes to the code base. When you compile your own code using the CLI, you may also be
+affected. We consider these rules important, and the primary recommendation is to try to update your code according to the
+documentation above. But those that prefer to not enable the rules, or need time to perform the updates, may update their
+local `.eslintrc.js` file(s) in the repo root and/or in individual plugins as they see fit:
+
+```js
+module.exports = {
+  // ... other declarations
+  rules: {
+    '@typescript-eslint/no-shadow': 'off',
+    '@typescript-eslint/no-redeclare': 'off',
+  },
+};
+```
+
+Because of the nature of this change, we're unable to provide a grace period for the update :(
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 62be0a6cea..0fe1642394 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -3,6 +3,7 @@ name: E2E Test Linux
 on:
   pull_request:
     paths-ignore:
+      - '.changeset/**'
       - 'contrib/**'
       - 'docs/**'
       - 'microsite/**'