diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index d7235eaa..ea9925d1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,7 +1,7 @@
 name: 🐞 Bug
 description: Report a bug or an issue you've found in dbt-athena
 title: "[Bug] <title>"
-labels: ["bug"]
+labels: ["bug","triage"]
 body:
 - type: markdown
   attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 39a9418b..06a3d77f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,7 +1,7 @@
 name: ✨ Feature
 description: Propose a straightforward extension of dbt functionality
 title: "[Feature] <title>"
-labels: ["feature"]
+labels: ["feature","triage"]
 body:
 - type: markdown
   attributes:
diff --git a/.github/ISSUE_TEMPLATE/other.yml b/.github/ISSUE_TEMPLATE/other.yml
index ea166843..1f8549a5 100644
--- a/.github/ISSUE_TEMPLATE/other.yml
+++ b/.github/ISSUE_TEMPLATE/other.yml
@@ -1,7 +1,7 @@
 name: Other
 description: Anything that is not a bug or a feature
 title: "<title>"
-labels: []
+labels: ["triage"]
 body:
 - type: checkboxes
   attributes:
diff --git a/.github/workflows/issue-triage.yml b/.github/workflows/issue-triage.yml
new file mode 100644
index 00000000..7d2ed8e0
--- /dev/null
+++ b/.github/workflows/issue-triage.yml
@@ -0,0 +1,20 @@
+name: "Issue triage"
+run-name: "Issue triage - #${{ github.event.issue.number }}: ${{ github.event.issue.title }} - ${{ github.actor }}"
+
+on: issue_comment
+
+defaults:
+    run:
+        shell: bash
+
+permissions:
+    issues: write
+
+jobs:
+    triage:
+        if: contains(github.event.issue.labels.*.name, 'awaiting_response')
+        uses: dbt-labs/actions/.github/workflows/swap-labels.yml@main
+        with:
+            add_label: "triage"
+            remove_label: "awaiting_response"
+        secrets: inherit