diff --git a/.github/workflows/opened-pr-triage.yml b/.github/workflows/opened-pr-triage.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d1a9a4ad3700dce52856afb9ab723a2a6869eb23
--- /dev/null
+++ b/.github/workflows/opened-pr-triage.yml
@@ -0,0 +1,14 @@
+name: Mark new pull request as waiting review
+
+on:
+  pull_request:
+    types: [opened]
+
+jobs:
+  needs-triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-ecosystem/action-add-labels@v1
+        with:
+          labels: waiting-review
diff --git a/.github/workflows/stale-pr.yml b/.github/workflows/stale-pr.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e42bf2bc31ac8bb672643d11958f151211989a93
--- /dev/null
+++ b/.github/workflows/stale-pr.yml
@@ -0,0 +1,19 @@
+name: Mark PR As Stale
+on:
+  schedule:
+    - cron: "30 1 * * *"
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v7
+        with:
+          stale-issue-label: "stale"
+          stale-pr-label: "stale"
+          stale-pr-message: "🚧🚨 This Pull Request is being marked as stale due to 30 days of inactivity. 🚧🚨"
+          days-before-pr-stale: 30
+          days-before-pr-close: -1
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 350cf5c29e2870da97065dd842b583406fd05f77..6db6893d90eff4651b19f9b8001e3e8071d5c9b9 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -10,13 +10,11 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v7
         with:
           days-before-issue-stale: 90
           days-before-issue-close: -1
           stale-issue-label: "stale"
           stale-issue-message: "🚧🚨 This issue is being marked as stale due to 90 days of inactivity. 🚧🚨"
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
           only-labels: 'needs triage'
           repo-token: ${{ secrets.GITHUB_TOKEN }}