diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index b8272362c..3eb7175ee 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -13,22 +13,20 @@ body:
       label: Package
       description: What package is affected?
       options:
-        - lucia-auth
-        - ​@lucia-auth/oauth
-        - ​@lucia-auth/tokens
-        - ​@lucia-auth/adapter-mongoose
+        - lucia
+        - ​@lucia-auth/adapter-test
+        - ​@lucia-auth/adapter-mongodb
         - ​@lucia-auth/adapter-mysql
         - ​@lucia-auth/adapter-postgresql
         - ​@lucia-auth/adapter-prisma
         - ​@lucia-auth/adapter-sqlite
-        - ​@lucia-auth/session-adapter-redis
-        - ​@lucia-auth/adapter-test
+        - ​@lucia-auth/session-drizzle
     validations:
       required: true
   - type: textarea
     id: description
     attributes:
       label: Describe the bug
-      description: Also tell us, what was the expected behavior? Reproduction is helpful for weeeird bugs!
+      description: Also tell us, what was the expected behavior? Reproduction will be super helpful!
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/documentation_bug_report.yaml b/.github/ISSUE_TEMPLATE/documentation_bug_report.yaml
deleted file mode 100644
index 2df8de07b..000000000
--- a/.github/ISSUE_TEMPLATE/documentation_bug_report.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Documentation Bug Report
-description: Report a bug regarding the docs website
-title: "[Docs-Bug]: "
-labels: ["bug", "documentation"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe the bug
-      description: A screenshot or a video are helpful as well!
-    validations:
-      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index e42c64822..b75ea9d8a 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -7,6 +7,21 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this feature request!
+  - type: dropdown
+    id: package
+    attributes:
+      label: Package
+      options:
+        - lucia
+        - ​@lucia-auth/adapter-test
+        - ​@lucia-auth/adapter-mongodb
+        - ​@lucia-auth/adapter-mysql
+        - ​@lucia-auth/adapter-postgresql
+        - ​@lucia-auth/adapter-prisma
+        - ​@lucia-auth/adapter-sqlite
+        - ​@lucia-auth/session-drizzle
+    validations:
+      required: true
   - type: textarea
     id: description
     attributes: