diff --git a/.github/workflows/call-issue-pr-tracker.yml b/.github/workflows/call-issue-pr-tracker.yml
new file mode 100644
index 0000000..87243e2
--- /dev/null
+++ b/.github/workflows/call-issue-pr-tracker.yml
@@ -0,0 +1,14 @@
+name: Issue & PR Tracker
+
+on:
+  issues:
+    types: [opened,reopened,labeled,unlabeled]
+  pull_request_target:
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
+
+jobs:
+  manage-project:
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
+    secrets: inherit
diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml
deleted file mode 100644
index 773767c..0000000
--- a/.github/workflows/call_invalid_helper.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Comment on invalid interaction
-on:
-  issues:
-    types:
-      - labeled
-jobs:
-  add-comment-on-invalid:
-    if: github.event.label.name == 'invalid'
-    permissions:
-      issues: write
-    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
-    secrets: inherit
diff --git a/.gitignore b/.gitignore
index 70f62d6..4d6f44d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 !.editorconfig
 !.gitattributes
 !.github
+!.github/**
 !.gitignore
 !*.conf.sample
 !LICENSE