diff --git a/.github/ISSUE_TEMPLATE/BUG-FORM.yml b/.github/ISSUE_TEMPLATE/BUG-FORM.yml
index c6c44a5ab5d..b15d5775796 100644
--- a/.github/ISSUE_TEMPLATE/BUG-FORM.yml
+++ b/.github/ISSUE_TEMPLATE/BUG-FORM.yml
@@ -16,10 +16,13 @@ body:
       multiple: true
       options:
         - json-rpc
-        - transports
         - networks
         - providers
+        - pubsub
+        - rpc-client
         - rpc-types
+        - signers
+        - transports
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/FEATURE-FORM.yml b/.github/ISSUE_TEMPLATE/FEATURE-FORM.yml
index dd62018175a..52ad62a0b2e 100644
--- a/.github/ISSUE_TEMPLATE/FEATURE-FORM.yml
+++ b/.github/ISSUE_TEMPLATE/FEATURE-FORM.yml
@@ -14,9 +14,13 @@ body:
       multiple: true
       options:
         - json-rpc
-        - transports
         - networks
         - providers
+        - pubsub
+        - rpc-client
+        - rpc-types
+        - signers
+        - transports
     validations:
       required: true
   - type: textarea