diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index da1e62c8e1..eebe583fe5 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -15,14 +15,21 @@ concurrency:
 
 jobs:
   stale:
+    if: github.repository_owner == 'esphome'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+      # The 90 day stale policy for PRs
+      # - PRs
+      # - No PRs marked as "not-stale"
+      # - No Issues (see below)
+      - name: 90 days stale PRs
+        uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
         with:
-          days-before-pr-stale: 90
-          days-before-pr-close: 7
+          days-before-stale: 90
+          days-before-close: 7
           days-before-issue-stale: -1
           days-before-issue-close: -1
+          operations-per-run: 150
           remove-stale-when-updated: true
           stale-pr-label: "stale"
           exempt-pr-labels: "not-stale"
@@ -30,21 +37,36 @@ jobs:
             There hasn't been any activity on this pull request recently. This
             pull request has been automatically marked as stale because of that
             and will be closed if no further activity occurs within 7 days.
-            Thank you for your contributions.
 
-  # Use stale to automatically close issues with a
-  # reference to the issue tracker
-  close-issues:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+            If you are the author of this PR, please leave a comment if you want
+            to keep it open. Also, please rebase your PR onto the latest dev
+            branch to ensure that it's up to date with the latest changes.
+
+            Thank you for your contribution!
+
+      # The 90 day stale policy for Issues
+      # - Issues
+      # - No Issues marked as "not-stale"
+      # - No PRs (see above)
+      - name: 90 days stale issues
+        uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
         with:
+          days-before-stale: 90
+          days-before-close: 7
           days-before-pr-stale: -1
           days-before-pr-close: -1
-          days-before-issue-stale: 1
-          days-before-issue-close: 1
           remove-stale-when-updated: true
           stale-issue-label: "stale"
           exempt-issue-labels: "not-stale"
           stale-issue-message: >
-            https://github.com/esphome/esphome/issues/430
+            There hasn't been any activity on this issue recently. Due to the
+            high number of incoming GitHub notifications, we have to clean some
+            of the old issues, as many of them have already been resolved with
+            the latest updates.
+
+            Please make sure to update to the latest ESPHome version and
+            check if that solves the issue. Let us know if that works for you by
+            adding a comment 👍
+
+            This issue has now been marked as stale and will be closed if no
+            further activity occurs. Thank you for your contributions.