diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 94%
rename from .github/ISSUE_TEMPLATE/bug.yml
rename to .github/ISSUE_TEMPLATE/bug_report.yml
index 52f37d5..7546b77 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -15,13 +15,12 @@ body:
       placeholder: I cannot currently do X thing because when I do, it breaks X thing.
     validations:
       required: true
-
   - type: input
     id: package-version
     attributes:
       label: Package Version
       description: What version of our Package are you running? Please be as specific as possible
-      placeholder: 2.0.0
+      placeholder: 1.0.0
     validations:
       required: true
   - type: input
@@ -29,7 +28,7 @@ body:
     attributes:
       label: PHP Version
       description: What version of PHP are you running? Please be as specific as possible
-      placeholder: 8.2.0
+      placeholder: 8.3.0
     validations:
       required: true
   - type: input
@@ -37,7 +36,7 @@ body:
     attributes:
       label: Laravel Version
       description: What version of Laravel are you running? Please be as specific as possible
-      placeholder: 9.0.0
+      placeholder: 11.0.0
     validations:
       required: true
   - type: dropdown
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 94f8257..0000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Questions & Feature Requests
-    url: https://github.com/codebar-ag/laravel-bexio/issues/new
-    about: Ask the community for help
-  - name: Report a security issue
-    url: https://github.com/codebar-ag/laravel-bexio/security/policy
-    about: Learn how to notify us for sensitive bugs
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..b259caf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,12 @@
+name: Question or Feature
+description: Open a Question or Feature Request
+title: "[Feature]: "
+labels: ["feature"]
+body:
+  - type: textarea
+    id: question-feature
+    attributes:
+      label: Question or Feature?
+      description: Enter a Question or Feature Request
+    validations:
+      required: true