diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 077d15f39f..af73d428a8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,7 @@
 # By default, review should come from the app-inner-loop team
 * @shopify/app-inner-loop
 
-# Theme team, or CLI owners can review theme changes
+# Theme team or CLI owners can review theme changes
 packages/theme/* @shopify/advanced-edits @shopify/app-inner-loop
+
+.changeset/* @shopify/advanced-edits @shopify/app-inner-loop
diff --git a/.github/workflows/reviewers-reminder.yml b/.github/workflows/reviewers-reminder.yml
deleted file mode 100644
index 09eabe118b..0000000000
--- a/.github/workflows/reviewers-reminder.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Reviewers reminder
-
-on:
-  pull_request:
-    types:
-      - opened
-
-jobs:
-  remind:
-    name: "[PR] Remind reviewers"
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.user.login != 'dependabot[bot]'
-    steps:
-      - name: comment PR
-        uses: unsplash/comment-on-pr@ffe8f97ccc63ce12c3c23c6885b169db67958d3b # pin@v1.3.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          msg: |
-            Thanks for your contribution!
-
-            Depending on what you are working on, you may want to request a review from a Shopify team:
-            - Themes: @shopify/advanced-edits
-            - UI extensions: @shopify/ui-extensions-cli
-              - Checkout UI extensions: @shopify/checkout-ui-extensions-api-stewardship
-            - Hydrogen: @shopify/hydrogen
-            - Other: @shopify/app-inner-loop