diff --git a/.github/ISSUE_TEMPLATE/0-bug.yaml b/.github/ISSUE_TEMPLATE/0-bug.yaml
index eac401d..f89612d 100644
--- a/.github/ISSUE_TEMPLATE/0-bug.yaml
+++ b/.github/ISSUE_TEMPLATE/0-bug.yaml
@@ -1,5 +1,6 @@
 name: "⚠️ Report an Issue"
 description: "Please let us know if something is not right..."
+type: bug
 labels: ["bug"]
 assignees:
   - smashedr
diff --git a/.github/ISSUE_TEMPLATE/1-feature.yaml b/.github/ISSUE_TEMPLATE/1-feature.yaml
index 9e69aa3..c0d3b35 100644
--- a/.github/ISSUE_TEMPLATE/1-feature.yaml
+++ b/.github/ISSUE_TEMPLATE/1-feature.yaml
@@ -1,5 +1,6 @@
 name: "🚀 Request a Feature"
 description: "Request new features or enhancements"
+type: feature
 labels: ["enhancement"]
 assignees:
   - smashedr
diff --git a/.github/workflows/issue.yaml b/.github/workflows/issue.yaml
index c62b7e6..211ab58 100644
--- a/.github/workflows/issue.yaml
+++ b/.github/workflows/issue.yaml
@@ -7,23 +7,22 @@ on:
 jobs:
   issue:
     name: "Issue"
+    if: ${{ !github.event.issue.type || github.event.issue.type.name == 'Bug' }}
     runs-on: ubuntu-latest
     timeout-minutes: 5
     permissions:
       contents: write
+      issues: write
     steps:
       - name: "Checkout"
         uses: actions/checkout@v6
 
       - name: "Create App Token"
-        if: ${{ !github.event.release.prerelease }}
         id: app
         uses: actions/create-github-app-token@v3
         with:
           app-id: 146360
           private-key: ${{ secrets.APP_PRIVATE_KEY }}
-          owner: ${{ github.repository_owner }}
-          repositories: ${{ github.event.repository.name }}
 
       - name: "AI Issue"
         uses: smashedr/ai-issue-action@master